Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Fri, 23 Feb 2007 05:27:37 +0000 (21:27 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 23 Feb 2007 05:27:37 +0000 (21:27 -0800)
* maint:
git-diff: fix combined diff
Fix 'git commit -a' in a newly initialized repository
Include git-gui credits file in dist.
Document the new core.bare configuration option.

1  2 
Documentation/config.txt
Makefile
Simple merge
diff --cc Makefile
Simple merge