Mercurial > hg > octave-lojdl > gnulib-hg
changeset 11703:89b12821209e
Add comment.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Thu, 02 Jul 2009 11:31:33 +0200 |
| parents | daa1eb869953 |
| children | d8024cba4b63 |
| files | ChangeLog lib/git-merge-changelog.c |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-07-02 Bruno Haible <bruno@clisp.org> + + * lib/git-merge-changelog.c (main): Add comment about git cherry-pick. + 2009-06-30 Bruno Haible <bruno@clisp.org> Reduce the number of uc_is_cased calls.
--- a/lib/git-merge-changelog.c +++ b/lib/git-merge-changelog.c @@ -975,7 +975,8 @@ 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 '. During a "git pull --rebase", - it is set to 'pull --rebase'. + it is set to 'pull --rebase'. During a "git cherry-pick", it is + set to 'cherry-pick'. - During a "git stash apply", there is an environment variable of the form GITHEAD_<40_hex_digits>='Stashed changes'. */ { @@ -1002,7 +1003,8 @@ downstream = true; else { - /* "git stash apply", "git rebase" and similar. */ + /* "git stash apply", "git rebase", "git cherry-pick" and + similar. */ downstream = false; } }