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 /daemon.c | |
parent | Merge branch 'js/remote-improvements' (diff) | |
parent | diff --cached: do not borrow from a work tree when a path is marked as assume... (diff) | |
download | tgif-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 'daemon.c')
0 files changed, 0 insertions, 0 deletions