From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 31 Jul 2013 19:38:23 +0000 (-0700)
Subject: Merge branch 'jk/commit-how-to-abort-cherry-pick'
X-Git-Tag: v1.8.4-rc1~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/af77c0b1cf3f8c8ba5ae30cec208227800447f99

Merge branch 'jk/commit-how-to-abort-cherry-pick'

* jk/commit-how-to-abort-cherry-pick:
commit: tweak empty cherry pick advice for sequencer
---

af77c0b1cf3f8c8ba5ae30cec208227800447f99
diff --cc builtin/commit.c
index 003bd7dbec,39717d55bc..10acc53f80
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -104,11 -113,12 +114,12 @@@ static enum 
  	CLEANUP_NONE,
  	CLEANUP_ALL
  } cleanup_mode;
 -static char *cleanup_arg;
 +static const char *cleanup_arg;
  
  static enum commit_whence whence;
+ static int sequencer_in_use;
  static int use_editor = 1, include_status = 1;
 -static int show_ignored_in_status;
 +static int show_ignored_in_status, have_option_m;
  static const char *only_include_assumed;
  static struct strbuf message = STRBUF_INIT;