summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-02-27 21:58:31 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-27 21:58:31 -0800
commit8978166e531e0941811099d4117574ebbbcf35d8 (patch)
tree97c222b3705ea1980557ae1f96dda1d272625a83 /t/t6023-merge-file.sh
parentMerge branch 'lp/config-vername-check' (diff)
parentpush.default: Rename 'tracking' to 'upstream' (diff)
downloadtgif-8978166e531e0941811099d4117574ebbbcf35d8.tar.xz
Merge branch 'jh/push-default-upstream-configname'
* jh/push-default-upstream-configname: push.default: Rename 'tracking' to 'upstream'
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions