diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-12 00:14:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-12 00:14:47 -0700 |
| commit | 1924d64f6e070edf1ad1949bf2eb95d4d2451f30 (patch) | |
| tree | af77317e800b35c312ef562ffb72fa7c045af738 /Makefile | |
| parent | 75d8ff138dd640a117c6aaa625d0f6b835adbd3a (diff) | |
| parent | 03e1bed4a4887607ae90cd121cb4851d10ef2e8b (diff) | |
| download | git-1924d64f6e070edf1ad1949bf2eb95d4d2451f30.tar.gz git-1924d64f6e070edf1ad1949bf2eb95d4d2451f30.tar.xz | |
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' 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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions