diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-08 23:23:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-08 23:23:17 -0700 |
| commit | 197cf8d59c0109f486ed6b56512b3c54ea44dccd (patch) | |
| tree | 5d5b49d0c8c825065657789dd23eefbe45195f25 /cache.h | |
| parent | 0122cf6611f0963a7aa72592da18013c3584557e (diff) | |
| parent | 150115aded2e1e0a83db7366f59e4b5bf1aa8135 (diff) | |
| download | git-197cf8d59c0109f486ed6b56512b3c54ea44dccd.tar.gz git-197cf8d59c0109f486ed6b56512b3c54ea44dccd.tar.xz | |
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
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions