Merge branch 'jc/pull-signed-tag'

* jc/pull-signed-tag: merge: use editor by default in interactive sessions Conflicts: Documentation/merge-options.txt

Junio C Hamano committed Jan 31, 2012 at 22:30 UTC af6b37fab1a97943c804f4983452c7fde5b0fbbe

No changes.