From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 12 Mar 2007 17:26:59 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~41^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2ec0cb7959b0bf965d54f95453f5b4b34e8d3100;p=git.git

Merge branch 'maint'

* maint:
  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
---

2ec0cb7959b0bf965d54f95453f5b4b34e8d3100