git.99rst.org Git - git.git/commit

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 46dc1b0 98fa473)

author	Junio C Hamano <redacted>
	Fri, 17 Oct 2008 20:03:52 +0000 (13:03 -0700)
committer	Junio C Hamano <redacted>
	Fri, 17 Oct 2008 20:03:52 +0000 (13:03 -0700)
commit	e845e16ee6de99a203db47eeb840daf3b1914ec9
tree	6881244e543cbf5b17cb31a8b8512fa758a608b5	tree \| snapshot
parent	46dc1b0e332612aa32c139007fa33f4b429de9d1	commit \| diff
parent	98fa473887d0bebd38d568bb07232a336a642dcf	commit \| diff

Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other

* jk/maint-ls-files-other:
refactor handling of "other" files in ls-files and status

Conflicts:
read-cache.c

cache.h	diff1 \|	diff2 \|	blob \| history
read-cache.c	diff1 \|	diff2 \|	blob \| history
t/t7502-status.sh	diff1 \|	diff2 \|	blob \| history
wt-status.c	diff1 \|	diff2 \|	blob \| history

git clone https://git.99rst.org/PROJECT