Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Tue, 12 Jun 2007 03:58:11 +0000 (23:58 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Tue, 12 Jun 2007 03:58:11 +0000 (23:58 -0400)
commit03e1bed4a4887607ae90cd121cb4851d10ef2e8b
tree166e015cd8b842fd28ddb138faa2ff7213528294
parentaa751960178af04673f88adca4988f94ffd7f2dc
parent39fa2a983d55b37759b99e67f9f1892879efb775
Merge branch 'maint'

* maint:
  git-gui: Save geometry before the window layout is damaged
  git-gui: Give amend precedence to HEAD over MERGE_MSG
git-gui.sh
lib/branch_rename.tcl
lib/remote_branch_delete.tcl