From 0f37e2e6ef48a1b0befb5c952ccb9cb013187053 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 11 Feb 2008 13:24:11 +0100 Subject: [PATCH] Comment changes. --- lib/git-merge-changelog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c index f2220f2154..98b6180dea 100644 --- a/lib/git-merge-changelog.c +++ b/lib/git-merge-changelog.c @@ -47,14 +47,14 @@ $ make install - Add to .git/config of the checkout (or to your $HOME/.gitconfig) the lines - [merge "cl-merge"] + [merge "merge-changelog"] name = GNU-style ChangeLog merge driver driver = /usr/local/bin/git-merge-changelog %O %A %B - In every directory that contains a ChangeLog file, add a file '.gitattributes' with this line: - ChangeLog merge=cl-merge + ChangeLog merge=merge-changelog (See "man 5 gitattributes" for more info.) */ @@ -828,7 +828,7 @@ There is NO WARRANTY, to the extent permitted by law.\n\ How to distinguish these situation? There are several hints: - During a "git stash apply", GIT_REFLOG_ACTION is not set. During - a "git pull", it is set to 'pull'. + a "git pull", it is set to 'pull '. - During a "git stash apply", there is an environment variable of the form GITHEAD_<40_hex_digits>='Stashed changes'. */ { -- 2.30.2