Add comment.

diff --git a/ChangeLog b/ChangeLog
index da6acc744cd3959c77e309612a97e0a92ad64920..0fdae2cf6d0c95418643ac9bba9bfcfba3aa2b1c 100644 (file)
--- 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.

diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 22d2bfd41e9aa3580728c228ee88b78fa38aaaeb..7db745306c282c10b99d9c0ad10b7f19f0b49f00 100644 (file)
--- 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;
                }
            }