summaryrefslogtreecommitdiff
path: root/t/t4034/matlab/pre
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-13 11:42:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-13 11:42:11 -0800
commit5a62b531ae1fda10d023082cb73a5440dbd54df1 (patch)
tree42895bf2539d5bf3ed6e17936d19679ffd2a9f6c /t/t4034/matlab/pre
parentMerge branch 'jc/branch-desc-typoavoidance' into maint (diff)
parentmerge: do not create a signed tag merge under --ff-only option (diff)
downloadtgif-5a62b531ae1fda10d023082cb73a5440dbd54df1.tar.xz
Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint
* jc/merge-ff-only-stronger-than-signed-merge: merge: do not create a signed tag merge under --ff-only option
Diffstat (limited to 't/t4034/matlab/pre')
0 files changed, 0 insertions, 0 deletions