diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:10:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:10:28 -0700 |
| commit | 88bbda08d7b9503862a8fb8846d78c67825e5e3d (patch) | |
| tree | 1eb8c68123ee29f1eb1ade9065041d8009ab95dc /Documentation/git-cherry-pick.txt | |
| parent | dd33927ccdb92205988ba98bb2bb7df47529cd6d (diff) | |
| parent | 473a189b92b70295157d20fe229d44824061c79f (diff) | |
| download | git-88bbda08d7b9503862a8fb8846d78c67825e5e3d.tar.gz git-88bbda08d7b9503862a8fb8846d78c67825e5e3d.tar.xz | |
Merge branch 'maint'
* maint:
Start preparing 1.5.6.4 release notes
git fetch-pack: do not complain about "no common commits" in an empty repo
rebase-i: keep old parents when preserving merges
t7600-merge: Use test_expect_failure to test option parsing
Fix buffer overflow in prepare_attr_stack
Fix buffer overflow in git diff
Fix buffer overflow in git-grep
git-cvsserver: fix call to nonexistant cleanupWorkDir()
Documentation/git-cherry-pick.txt et al.: Fix misleading -n description
Conflicts:
RelNotes
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index a691173ba..50fb3d5d5 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:: |