]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 652f0c8 150115a)
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 May 2009 22:01:26 +0000 (15:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 May 2009 22:01:26 +0000 (15:01 -0700)
commit3f3e2c26fa0325f4df952363f8f5046ca8158bb3
treec1fd36e7ba69f1b24f38a47d7cae407b26abd899tree | snapshot
parent652f0c8f1df362755253fe9c5a975be7e5a5cbdccommit | diff
parent150115aded2e1e0a83db7366f59e4b5bf1aa8135commit | diff
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1

* 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 | blob | history
t/t4020-diff-external.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.