Andrew's git / gitweb.git / diff
?
Merge branch 'cb/maint-ls-files-error-report' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 21:30:49 +0000 (14:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 21:30:49 +0000 (14:30 -0700)
* cb/maint-ls-files-error-report:
t3005: do not assume a particular order of stdout and stderr of git-ls-files
ls-files: fix pathspec display on error

1  2 
builtin/checkout.c patch | diff1 | diff2 | blob | history
cache.h patch | diff1 | diff2 | blob | history
diff --cc builtin/checkout.c
Simple merge
diff --cc cache.h
Simple merge