Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 19:42:11 +0000 (11:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 19:42:11 +0000 (11:42 -0800)
commit5a62b531ae1fda10d023082cb73a5440dbd54df1
tree42895bf2539d5bf3ed6e17936d19679ffd2a9f6c
parent8eb865ba8a24aad5380a23fc1e331aba2f7c5bbb
parentb5c9f1c1b0ed9c91463b9f46a7c9dff3efc53773
Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint

* jc/merge-ff-only-stronger-than-signed-merge:
  merge: do not create a signed tag merge under --ff-only option