Merge branch 'maint'
commite79cbbea9e5a9b08722f35dbca3d04c7f40a1aa1
authorJunio C Hamano <junkio@cox.net>
Fri, 23 Feb 2007 05:27:37 +0000 (22 21:27 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 23 Feb 2007 05:27:37 +0000 (22 21:27 -0800)
treeb0974609d67763a8580bba07839a528c6fab7042
parent2470653196fa8461ff5895c521519e947482eae1
parent75b62b489af7b62a5518c3f199d2a2776205e088
Merge branch 'maint'

* 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.
Documentation/config.txt
Makefile