| commit | 197cf8d59c0109f486ed6b56512b3c54ea44dccd | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Apr 2009 06:23:17 +0000 (8 23:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Apr 2009 06:23:17 +0000 (8 23:23 -0700) | ||
| tree | 5d5b49d0c8c825065657789dd23eefbe45195f25 | treesnapshot (tar.gz zip) |
| parent | 0122cf6611f0963a7aa72592da18013c3584557e | commitdiff |
| parent | 150115aded2e1e0a83db7366f59e4b5bf1aa8135 | commitdiff |
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
* 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
| diff.c | diff1 | diff2 | blobhistory |
| t/t4020-diff-external.sh | diff1 | diff2 | blobhistory |