Re: git-merge-changelog usage error during rebase

2009-03-09 Thread James Youngman
On Mon, Mar 9, 2009 at 12:42 AM, James Youngman wrote: > $ git rebase master > First, rewinding head to replay your work on top of it... > Applying Update to version 0.17 of GNU gettext. > error: patch failed: ChangeLog:41 > error: ChangeLog: patch does not apply > Using index info to reconstruct

Re: git-merge-changelog usage error during rebase

2009-03-08 Thread James Youngman
On Mon, Mar 9, 2009 at 12:42 AM, James Youngman wrote: > $ git checkout jy/auto-gettext > Switched to branch "jy/auto-gettext" > $ git rebase master > First, rewinding head to replay your work on top of it... > Applying Update to version 0.17 of GNU gettext. > error: patch failed: ChangeLog:41 > e

git-merge-changelog usage error during rebase

2009-03-08 Thread James Youngman
$ git checkout jy/auto-gettext Switched to branch "jy/auto-gettext" $ git rebase master First, rewinding head to replay your work on top of it... Applying Update to version 0.17 of GNU gettext. error: patch failed: ChangeLog:41 error: ChangeLog: patch does not apply Using index info to reconstruct