From 4bee958479bed1d3a8f20a75f33422ee49939dbf Mon Sep 17 00:00:00 2001
From: Chris Webb <chris@arachsys.com>
Date: Thu, 2 Aug 2012 11:38:51 +0100
Subject: cherry-pick: add --allow-empty-message option

Scripts such as "git rebase -i" cannot currently cherry-pick commits
which have an empty commit message, as git cherry-pick calls git
commit without the --allow-empty-message option.

Add an --allow-empty-message option to git cherry-pick which is passed
through to git commit, so this behaviour can be overridden.

Signed-off-by: Chris Webb <chris@arachsys.com>
Reviewed-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 sequencer.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sequencer.h')

diff --git a/sequencer.h b/sequencer.h
index aa5f17cc3..d8494201e 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;
-- 
cgit v1.2.1