Andrew's git / gitweb.git / diff
?
Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 22:08:02 +0000 (14:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 22:08:02 +0000 (14:08 -0800)
* jc/merge-ff-only-stronger-than-signed-merge:
merge: do not create a signed tag merge under --ff-only option

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history
diff --cc builtin/merge.c
Simple merge