Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Nov 2008 22:46:31 +0000 (14:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Nov 2008 22:49:50 +0000 (14:49 -0800)
* maint:
  Fix non-literal format in printf-style calls
  git-submodule: Avoid printing a spurious message.
  git ls-remote: make usage string match manpage
  Makefile: help people who run 'make check' by mistake

1  2 
Makefile
builtin-remote.c
environment.c
fsck.c
git-submodule.sh
grep.c
refs.c

diff --cc Makefile
Simple merge
Simple merge
diff --cc environment.c
Simple merge
diff --cc fsck.c
Simple merge
Simple merge
diff --cc grep.c
Simple merge
diff --cc refs.c
Simple merge