X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-cherry-pick.txt;h=837fb08b7971a8b948dd7d039bab4a3c2e54cac7;hb=18e143487ddb5b32b2f6003972d2115bb4ac460f;hp=a691173ba13370330b97907cf751342cf1c0fe44;hpb=5f2f71f6af0fc66cf4c590a1806ee18b197e086e;p=git.git diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index a691173ba..837fb08b7 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -58,14 +58,14 @@ OPTIONS Usually the command automatically creates a commit with a commit log message stating which commit was cherry-picked. This flag applies the change necessary - to cherry-pick the named commit to your working tree, - but does not make the commit. In addition, when this - option is used, your working tree does not have to match + to cherry-pick the named commit to your working tree + and the index, but does not make the commit. In addition, + when this option is used, your index does not have to match the HEAD commit. The cherry-pick is done against the - beginning state of your working tree. + beginning state of your index. + This is useful when cherry-picking more than one commits' -effect to your working tree in a row. +effect to your index in a row. -s:: --signoff:: @@ -74,7 +74,7 @@ effect to your working tree in a row. Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation --------------