![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Feb 2012 22:08:02 +0000 (14:08 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Feb 2012 22:08:02 +0000 (14:08 -0800) | ||
| commit | fd6abd0c65b38897da64ef883ed1934d2b2b1a3a | |
| tree | 8c787e5034449bda1dfd0ad5c4d1c17128354d3e | tree | snapshot |
| parent | d88698ec0b4b91e61b0fe3e00d7451abcdf4cd44 | commit | diff |
| parent | b5c9f1c1b0ed9c91463b9f46a7c9dff3efc53773 | commit | diff |
Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'
* 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 | | blob | history |