From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Feb 2018 20:45:04 +0000 (-0800)
Subject: Merge branch 'gs/rebase-allow-empty-message'
X-Git-Tag: v2.17.0-rc0~84
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2f6128daab0764c3915dcc9e01c27381b63f5e40?ds=inline;hp=-c

Merge branch 'gs/rebase-allow-empty-message'

"git rebase" learned to take "--allow-empty-message" option.

* gs/rebase-allow-empty-message:
rebase: add --allow-empty-message option
---

2f6128daab0764c3915dcc9e01c27381b63f5e40
diff --combined builtin/rebase--helper.c
index 00faf14d07,2090114e9a..ad074705bb
--- a/builtin/rebase--helper.c
+++ b/builtin/rebase--helper.c
@@@ -22,6 -22,8 +22,8 @@@ int cmd_rebase__helper(int argc, const 
  	struct option options[] = {
  		OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")),
  		OPT_BOOL(0, "keep-empty", &keep_empty, N_("keep empty commits")),
+ 		OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message,
+ 			N_("allow commits with empty messages")),
  		OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
  				CONTINUE),
  		OPT_CMDMODE(0, "abort", &command, N_("abort rebase"),
@@@ -43,7 -45,7 +45,7 @@@
  		OPT_END()
  	};
  
 -	git_config(git_default_config, NULL);
 +	sequencer_init_config(&opts);
  	git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands);
  
  	opts.action = REPLAY_INTERACTIVE_REBASE;