diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-10 14:08:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-10 14:08:02 -0800 |
| commit | fd6abd0c65b38897da64ef883ed1934d2b2b1a3a (patch) | |
| tree | 8c787e5034449bda1dfd0ad5c4d1c17128354d3e /mergetools/opendiff | |
| parent | Merge branch 'jc/branch-desc-typoavoidance' (diff) | |
| parent | merge: do not create a signed tag merge under --ff-only option (diff) | |
| download | tgif-fd6abd0c65b38897da64ef883ed1934d2b2b1a3a.tar.xz | |
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
Diffstat (limited to 'mergetools/opendiff')
0 files changed, 0 insertions, 0 deletions