Merge branch 'maint' to sync with 1.6.0.1
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 21:48:36 +0000 (14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 21:50:44 +0000 (14:50 -0700)
commit49d3536...94e653717844d53825fa7c0a494888f7
tree35022ab...51934461b2a9f21cce140b5a773369c6copy hash to clipboard (tree)
parent98fcf84...af443a0a93b9a6cd1fada5af826383f3copy hash to clipboard (diff)
parent5760a6b...94736e6f59eb32c7abb4cdbb7fca1627copy hash to clipboard (diff)
Documentation/config.txt
Documentation/git.txt
Makefile
builtin-merge.c
combine-diff.c
t/t4015-diff-whitespace.sh