summaryrefslogtreecommitdiff
path: root/t/t4013/diff.log_--root_master
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-08 23:23:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-08 23:23:17 -0700
commit197cf8d59c0109f486ed6b56512b3c54ea44dccd (patch)
tree5d5b49d0c8c825065657789dd23eefbe45195f25 /t/t4013/diff.log_--root_master
parentMerge branch 'maint-1.6.1' into maint (diff)
parentdiff --cached: do not borrow from a work tree when a path is marked as assume... (diff)
downloadtgif-197cf8d59c0109f486ed6b56512b3c54ea44dccd.tar.xz
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint
* jc/maint-1.6.0-diff-borrow-carefully: diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
Diffstat (limited to 't/t4013/diff.log_--root_master')
0 files changed, 0 insertions, 0 deletions