From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 1 Feb 2012 06:30:42 +0000 (-0800)
Subject: Merge branch 'jc/pull-signed-tag'
X-Git-Tag: v1.7.10-rc0~123
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af6b37fab1a97943c804f4983452c7fde5b0fbbe;p=git.git

Merge branch 'jc/pull-signed-tag'

* jc/pull-signed-tag:
  merge: use editor by default in interactive sessions

Conflicts:
	Documentation/merge-options.txt
---

af6b37fab1a97943c804f4983452c7fde5b0fbbe
diff --cc builtin/merge.c
index 3a451727d,0006175d1..bfb75476a
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@@ -46,12 -44,11 +46,12 @@@ static const char * const builtin_merge
  	NULL
  };
  
 -static int show_diffstat = 1, shortlog_len, squash;
 +static int show_diffstat = 1, shortlog_len = -1, squash;
  static int option_commit = 1, allow_fast_forward = 1;
- static int fast_forward_only, option_edit;
+ static int fast_forward_only, option_edit = -1;
  static int allow_trivial = 1, have_message;
 -static struct strbuf merge_msg;
 +static int overwrite_ignore = 1;
 +static struct strbuf merge_msg = STRBUF_INIT;
  static struct commit_list *remoteheads;
  static struct strategy **use_strategies;
  static size_t use_strategies_nr, use_strategies_alloc;