summaryrefslogtreecommitdiff
path: root/t/t5100/info0012
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-05-03 15:01:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-05-03 15:01:26 -0700
commit3f3e2c26fa0325f4df952363f8f5046ca8158bb3 (patch)
treec1fd36e7ba69f1b24f38a47d7cae407b26abd899 /t/t5100/info0012
parentMerge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1 (diff)
parentdiff --cached: do not borrow from a work tree when a path is marked as assume... (diff)
downloadtgif-3f3e2c26fa0325f4df952363f8f5046ca8158bb3.tar.xz
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1
* 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/t5100/info0012')
0 files changed, 0 insertions, 0 deletions