X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-cherry-pick.txt;h=9d8fe0d26145ae45f566d3e8d4253c396630b41f;hb=b602ed7dea968d72c5b3f61ca016de7f285d80ef;hp=01db83039fc36aa4bc08eab730db48ec513ec583;hpb=9db19414582fdb154384ff1ca457cbf9095fef48;p=git.git diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 01db83039..9d8fe0d26 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -51,9 +51,10 @@ OPTIONS message prior to committing. -x:: - When recording the commit, append to the original commit - message a note that indicates which commit this change - was cherry-picked from. Append the note only for cherry + When recording the commit, append a line that says + "(cherry picked from commit ...)" to the original commit + message in order to indicate which commit this change was + cherry-picked from. This is done only for cherry picks without conflicts. Do not use this option if you are cherry-picking from your private branch because the information is useless to the recipient. If on the