bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Ralf Wildenhues
Subject: git-merge-changelog: mention --split-merged-entry in the header comment.
Date: Sun, 23 May 2010 10:02:57 +0200
User-agent: Mutt/1.5.20 (2009-10-28)

Hello Bruno,

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, and the header comment was enough for me otherwise.  Very nice!
(I was going to try to extend the code to do something about split
headers, but am happy now to see that the functionality alread exists.)

How about this patch to mention the switch there?

Also, I noticed that this file is copyrighted by you, not to the FSF
Oversight?

Cheers, and thanks again for this very helpful tool,
Ralf

    git-merge-changelog: mention --split-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 = GNU-style ChangeLog merge driver
                 driver = /usr/local/bin/git-merge-changelog %O %A %B
 
+     Be sure to use an absolute path, otherwise the driver will not be found.
+     You can add the --split-merged-entry option if you merge unrelated entries
+     with the same date and author.
+
    - In every directory that contains a ChangeLog file, add a file
      '.gitattributes' with this line:
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]