diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-28 00:42:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-28 00:42:31 -0700 |
| commit | aa72a14a7f648ae47749281002e94cfcf36f39e2 (patch) | |
| tree | a63743757a78f2585f13550faec0ed474cca36cd /t/Makefile | |
| parent | 48bcfbd1342f69a523c4214804682458e1121bd9 (diff) | |
| parent | 150115aded2e1e0a83db7366f59e4b5bf1aa8135 (diff) | |
| download | git-aa72a14a7f648ae47749281002e94cfcf36f39e2.tar.gz git-aa72a14a7f648ae47749281002e94cfcf36f39e2.tar.xz | |
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
* 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/Makefile')
0 files changed, 0 insertions, 0 deletions