Code

Merge branch 'maint' gitgui-0.6.5
authorShawn O. Pearce <spearce@spearce.org>
Mon, 12 Mar 2007 17:26:59 +0000 (13:26 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 12 Mar 2007 17:26:59 +0000 (13:26 -0400)
commit2ec0cb7959b0bf965d54f95453f5b4b34e8d3100
tree56e3e7313ce204a3cef274c81e8f125f9b03669e
parent0c3b4aac8ecdd039bac663a7d1b6bd373b7e250d
parent756d846fea4ac4b3bf0a0aea9fbf721138cf34cc
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
Makefile