Sync with 1.7.11.6
commit1c88a6d17492b197b9b3298cbc34efa804928302
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:23:45 +0000 (11 11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:23:54 +0000 (11 11:23 -0700)
treeb0370caa6322930a13898673c5a559aef20c8791
parent31190841049549b5daaffeb0b9888ebed0bbfc8a
parente09e4024a070e666ed40b66442e8151b91d623e4
Sync with 1.7.11.6

Signed-off-by: Junio C Hamano <gitster@pobox.com>
14 files changed:
Documentation/git-config.txt
Documentation/git.txt
builtin/apply.c
builtin/blame.c
builtin/checkout.c
builtin/config.c
cache.h
diff.c
git-submodule.sh
merge-recursive.c
notes-merge.c
read-cache.c
revision.c
t/t7400-submodule-basic.sh