![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 12 Jun 2007 03:58:11 +0000 (23:58 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 12 Jun 2007 03:58:11 +0000 (23:58 -0400) | ||
| commit | 03e1bed4a4887607ae90cd121cb4851d10ef2e8b | |
| tree | 166e015cd8b842fd28ddb138faa2ff7213528294 | tree | snapshot |
| parent | aa751960178af04673f88adca4988f94ffd7f2dc | commit | diff |
| parent | 39fa2a983d55b37759b99e67f9f1892879efb775 | commit | diff |
Merge branch 'maint'
* maint:
git-gui: Save geometry before the window layout is damaged
git-gui: Give amend precedence to HEAD over MERGE_MSG
* maint:
git-gui: Save geometry before the window layout is damaged
git-gui: Give amend precedence to HEAD over MERGE_MSG
| git-gui.sh | diff1 | | diff2 | | blob | history |
| lib/branch_rename.tcl | diff1 | | | | blob | history |
| lib/remote_branch_delete.tcl | diff1 | | | | blob | history |