summaryrefslogtreecommitdiff
path: root/t/t5404-tracking-branches.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-22 09:04:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-22 09:27:07 -0700
commit3c656899cdfbfdd40987625c4615a8c941d5968a (patch)
tree547b892074d90da576a25066e3504af9c60460f5 /t/t5404-tracking-branches.sh
parentMerge branch 'jc/t9129-any-utf8' into maint (diff)
parentdiff: fix "git show -C -C" output when renaming a binary file (diff)
downloadtgif-3c656899cdfbfdd40987625c4615a8c941d5968a.tar.xz
Merge branch 'cc/maint-diff-CC-binary' into maint
* cc/maint-diff-CC-binary: diff: fix "git show -C -C" output when renaming a binary file Conflicts: diff.c
Diffstat (limited to 't/t5404-tracking-branches.sh')
0 files changed, 0 insertions, 0 deletions