summaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-01-10 10:39:04 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-01-10 10:39:04 -0800
commit567323d387dda559dbdba8c15453aba629393955 (patch)
tree176085ab5fc95105a53a6bb631e1a0aeecf9da9a /t/t6020-merge-df.sh
parentDocumentation/githooks: post-rewrite-copy-notes never existed (diff)
parentDocumentation/git-archive: spell --worktree-attributes correctly (diff)
downloadtgif-567323d387dda559dbdba8c15453aba629393955.tar.xz
Merge branch 'maint-1.7.0' into maint-1.7.1
* maint-1.7.0: Documentation/git-archive: spell --worktree-attributes correctly
Diffstat (limited to 't/t6020-merge-df.sh')
0 files changed, 0 insertions, 0 deletions