git.oblomov.eu Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Sat, 28 Mar 2009 07:42:31 +0000 (00:42 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Sat, 28 Mar 2009 07:42:31 +0000 (00:42 -0700)
commit	aa72a14a7f648ae47749281002e94cfcf36f39e2
tree	a63743757a78f2585f13550faec0ed474cca36cd	tree \| snapshot
parent	48bcfbd1342f69a523c4214804682458e1121bd9	commit \| diff
parent	150115aded2e1e0a83db7366f59e4b5bf1aa8135	commit \| diff

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

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.

RSS Atom

diff.c	diff1 \|	diff2 \|	blob \| history
t/t4020-diff-external.sh	diff1 \|	diff2 \|	blob \| history