Mercurial > hg > octave-nkf > gnulib-hg
changeset 9693:2e591b4ebd0d
Comment changes.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 11 Feb 2008 13:24:11 +0100 |
parents | b25b75624f04 |
children | 6a8d9b9a5d7c |
files | lib/git-merge-changelog.c |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ 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'. */ {