summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-12 07:14:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-12 07:14:47 (GMT)
commit1924d64f6e070edf1ad1949bf2eb95d4d2451f30 (patch)
treeaf77317e800b35c312ef562ffb72fa7c045af738 /GIT-VERSION-GEN
parent75d8ff138dd640a117c6aaa625d0f6b835adbd3a (diff)
parent03e1bed4a4887607ae90cd121cb4851d10ef2e8b (diff)
downloadgit-1924d64f6e070edf1ad1949bf2eb95d4d2451f30.zip
git-1924d64f6e070edf1ad1949bf2eb95d4d2451f30.tar.gz
git-1924d64f6e070edf1ad1949bf2eb95d4d2451f30.tar.bz2
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 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions