X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-cherry-pick.txt;h=bfa950ca19c701bd3837a874bbeeb18b440ed44f;hb=731651fe25a7d7a242584e4b85112a610c32a23f;hp=5e0ef5ae0be005ad2da128f9304fe2d178d732d6;hpb=8bf14d6ef9245f3b81d24cb7725a868f62343277;p=git.git diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 5e0ef5ae..bfa950ca 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -3,7 +3,7 @@ git-cherry-pick(1) NAME ---- -git-cherry-pick - Apply the change introduced by an existing commit. +git-cherry-pick - Apply the change introduced by an existing commit SYNOPSIS -------- @@ -20,19 +20,19 @@ OPTIONS :: Commit to cherry-pick. ---edit:: +-e|--edit:: With this option, `git-cherry-pick` will let you edit the commit message prior committing. --r:: +-r|--replay:: Usually the command appends which commit was cherry-picked after the original commit message when making a commit. This option, '--replay', causes it to use the original commit message intact. This is useful when you are reordering the patches in your private tree - before publishing, and is used by 'git rebase'. + before publishing. --n:: +-n|--no-commit:: Usually the command automatically creates a commit with a commit log message stating which commit was cherry-picked. This flag applies the change necessary