diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-03 15:53:37 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-03 15:53:37 -0700 |
commit | 831287d37c059d71a20c3c164bc743217114d94e (patch) | |
tree | afe1ac07d7898100ea4bdb3dd9282899596fe609 /sequencer.h | |
parent | 12d858aeb45f6eae3eaecb49ccb6f61affca54cd (diff) | |
parent | 4bee958479bed1d3a8f20a75f33422ee49939dbf (diff) | |
download | git-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 'sequencer.h')
-rw-r--r-- | sequencer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index aa5f17cc30..d8494201e0 100644 --- a/sequencer.h +++ b/sequencer.h @@ -30,6 +30,7 @@ struct replay_opts { int allow_ff; int allow_rerere_auto; int allow_empty; + int allow_empty_message; int keep_redundant_commits; int mainline; |