Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/pull-signed-tag'
[gitweb.git]
/
Documentation
/
git-cherry-pick.txt
diff --git
a/Documentation/git-cherry-pick.txt
b/Documentation/git-cherry-pick.txt
index 21998b820efbf3b600813bb1c7d32224f61e46c1..fed5097e00b4a031c2992ac3d421f6df975e6152 100644
(file)
--- a/
Documentation/git-cherry-pick.txt
+++ b/
Documentation/git-cherry-pick.txt
@@
-11,6
+11,7
@@
SYNOPSIS
'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>...
'git cherry-pick' --continue
'git cherry-pick' --quit
+'git cherry-pick' --abort
DESCRIPTION
-----------