From 26bcf332910819619fc48ee9f248822dd0babfd6 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 2 Jul 2009 11:31:33 +0200 Subject: [PATCH] Add comment. --- ChangeLog | 4 ++++ lib/git-merge-changelog.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index da6acc744..0fdae2cf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-07-02 Bruno Haible + + * lib/git-merge-changelog.c (main): Add comment about git cherry-pick. + 2009-06-30 Bruno Haible Reduce the number of uc_is_cased calls. diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c index 22d2bfd41..7db745306 100644 --- a/lib/git-merge-changelog.c +++ b/lib/git-merge-changelog.c @@ -975,7 +975,8 @@ 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 '. 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 @@ There is NO WARRANTY, to the extent permitted by law.\n\ downstream = true; else { - /* "git stash apply", "git rebase" and similar. */ + /* "git stash apply", "git rebase", "git cherry-pick" and + similar. */ downstream = false; } } -- 2.11.0