| commit | 6828375ae91e113929333955b15b2d0eb0b762ce | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Mar 2009 07:46:45 +0000 (24 00:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Mar 2009 07:46:45 +0000 (24 00:46 -0700) | ||
| tree | e22e4cafabcbf89e394a08f14da43e5ac099e48e | treesnapshot (tar.gz zip) |
| parent | e4bb70a50ff3b3faaa626c3098cc3840e46fea14 | commitdiff |
| parent | 150115aded2e1e0a83db7366f59e4b5bf1aa8135 | commitdiff |
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into next
* 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 |