Merge branch 'maint'
commit9550a9cea9ee7a1f88c362a36a8ba0b4d7e205f4
authorJunio C Hamano <junkio@cox.net>
Tue, 13 Mar 2007 06:13:01 +0000 (12 23:13 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 13 Mar 2007 06:13:01 +0000 (12 23:13 -0700)
treea1139d87abbf7d1ac72f7b68378b849dea890b33
parentf8a066581d0d3b0044e885f5d76170313db35d6c
parent65d61e5f512f15b8384a2b6bfe818713fe5bebcb
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
Makefile