From: Junio C Hamano <junkio@cox.net>
Date: Fri, 23 Feb 2007 05:27:37 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~259
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e79cbbea9e5a9b08722f35dbca3d04c7f40a1aa1;p=git.git

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.
---

e79cbbea9e5a9b08722f35dbca3d04c7f40a1aa1