From: Junio C Hamano <junkio@cox.net>
Date: Tue, 13 Mar 2007 06:13:01 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~42
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9550a9cea9ee7a1f88c362a36a8ba0b4d7e205f4;p=git.git

Merge branch 'maint'

* maint:
  Don't package the git-gui credits file anymore
  git-gui: Allow 'git gui version' outside of a repository
  git-gui: Revert "git-gui: Display all authors of git-gui."
  git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
  git-gui: Allow committing empty merges
---

9550a9cea9ee7a1f88c362a36a8ba0b4d7e205f4