Re: git-merge-changelog: mention --split-merged-entry in the header comment.

2010-05-24 Thread Ralf Wildenhues
* Bruno Haible wrote on Sun, May 23, 2010 at 06:12:46PM CEST: > > Also, I noticed that this file is copyrighted by you, not to the FSF > > Oversight? > > Some day, I intend to put this into a better place than gnulib, or have it > distributed as a contrib in git. Don't know. - Since git is GPLv2 a

Re: git-merge-changelog: mention --split-merged-entry in the header comment.

2010-05-24 Thread Bruno Haible
Hi Eric, > merge neighboring entries if > they share the same author and date, to get a rebased series to use the > same style as the original branch, so that the mere act of rebasing > doesn't break the author's style of merged entries? I can imagine an option that would serve this purpose (for

Re: git-merge-changelog: mention --split-merged-entry in the header comment.

2010-05-24 Thread Eric Blake
On 05/23/2010 10:12 AM, Bruno Haible wrote: > Hi Ralf, > >> I only now became aware of the --split-merged-entry option which >> git-merge-changelog provides, because I never bothered to look at --help >> output > > Whereas I was aware of the option, but thought I would never need it, > and was th

Re: git-merge-changelog: mention --split-merged-entry in the header comment.

2010-05-23 Thread Bruno Haible
Hi Ralf, > I only now became aware of the --split-merged-entry option which > git-merge-changelog provides, because I never bothered to look at --help > output Whereas I was aware of the option, but thought I would never need it, and was then surprised to have conflicts in ChangeLog at each step

git-merge-changelog: mention --split-merged-entry in the header comment.

2010-05-23 Thread Ralf Wildenhues
-merged-entry in the header comment. * lib/git-merge-changelog.c: Update header comment. diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c index b9ab429..a6718db 100644 --- a/lib/git-merge-changelog.c +++ b/lib/git-merge-changelog.c @@ -51,6 +51,10 @@ name