commit | 3f3e2c26fa0325f4df952363f8f5046ca8158bb3 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Sun May 03 15:01:26 2009 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Sun May 03 15:01:26 2009 -0700 |
tree | c1fd36e7ba69f1b24f38a47d7cae407b26abd899 | |
parent | 652f0c8f1df362755253fe9c5a975be7e5a5cbdc [diff] | |
parent | 150115aded2e1e0a83db7366f59e4b5bf1aa8135 [diff] |
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