summaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-10 14:08:02 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-10 14:08:02 -0800
commitfd6abd0c65b38897da64ef883ed1934d2b2b1a3a (patch)
tree8c787e5034449bda1dfd0ad5c4d1c17128354d3e /t/t6020-merge-df.sh
parentMerge branch 'jc/branch-desc-typoavoidance' (diff)
parentmerge: do not create a signed tag merge under --ff-only option (diff)
downloadtgif-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 't/t6020-merge-df.sh')
0 files changed, 0 insertions, 0 deletions