| commit | 0fabf12866d6d80b586374d71cb8e28c3de37d6f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Feb 2012 23:56:28 +0000 (6 15:56 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Feb 2012 23:56:28 +0000 (6 15:56 -0800) | ||
| tree | fab12808dc9c5ae0bdcaedef4797255644a4358f | treesnapshot (tar.gz zip) |
| parent | 9fb0568f9ea747786dc3a398377d01b928f01d25 | commitdiff |
| parent | b5c9f1c1b0ed9c91463b9f46a7c9dff3efc53773 | commitdiff |
Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into next
* jc/merge-ff-only-stronger-than-signed-merge:
merge: do not create a signed tag merge under --ff-only option
* jc/merge-ff-only-stronger-than-signed-merge:
merge: do not create a signed tag merge under --ff-only option
| builtin/merge.c | diff1 | diff2 | blobhistory |