| commit | 31c74ca67162674e3ff8fcc294b75881c3e7cc15 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Jun 2007 07:05:24 +0000 (12 00:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Jun 2007 07:05:24 +0000 (12 00:05 -0700) | ||
| tree | f89e59d93c018800658d7ae0016cdac64f1faef3 | treesnapshot (tar.gz zip) |
| parent | c288a2f1316b642ff073d4213cf691297610503c | commitdiff |
| parent | 39fa2a983d55b37759b99e67f9f1892879efb775 | commitdiff |
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui:
git-gui: Save geometry before the window layout is damaged
git-gui: Give amend precedence to HEAD over MERGE_MSG
git-gui: Include 'war on whitespace' fixes from git.git
* 'maint' of git://repo.or.cz/git-gui:
git-gui: Save geometry before the window layout is damaged
git-gui: Give amend precedence to HEAD over MERGE_MSG
git-gui: Include 'war on whitespace' fixes from git.git