summaryrefslogtreecommitdiff
path: root/Documentation/git-cherry-pick.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-03 15:53:37 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-03 15:53:37 -0700
commit831287d37c059d71a20c3c164bc743217114d94e (patch)
treeafe1ac07d7898100ea4bdb3dd9282899596fe609 /Documentation/git-cherry-pick.txt
parent12d858aeb45f6eae3eaecb49ccb6f61affca54cd (diff)
parent4bee958479bed1d3a8f20a75f33422ee49939dbf (diff)
downloadgit-831287d37c059d71a20c3c164bc743217114d94e.tar.gz
Merge branch 'cw/cherry-pick-allow-empty-message'
"git cherry-pick" by default stops when it sees a commit without any log message. The "--allow-empty-message" option can be used to silently proceed. * cw/cherry-pick-allow-empty-message: cherry-pick: add --allow-empty-message option
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
-rw-r--r--Documentation/git-cherry-pick.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 0e170a51ca..c205d2363e 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -118,6 +118,11 @@ effect to your index in a row.
previous commit are dropped. To force the inclusion of those commits
use `--keep-redundant-commits`.
+--allow-empty-message::
+ By default, cherry-picking a commit with an empty message will fail.
+ This option overrides that behaviour, allowing commits with empty
+ messages to be cherry picked.
+
--keep-redundant-commits::
If a commit being cherry picked duplicates a commit already in the
current history, it will become empty. By default these