summaryrefslogtreecommitdiff
path: root/git-gui/lib/option.tcl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-06-12 00:14:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-06-12 00:14:47 -0700
commit1924d64f6e070edf1ad1949bf2eb95d4d2451f30 (patch)
treeaf77317e800b35c312ef562ffb72fa7c045af738 /git-gui/lib/option.tcl
parentMerge branch 'master' of git://repo.or.cz/git-gui (diff)
parentMerge branch 'maint' (diff)
downloadtgif-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 'git-gui/lib/option.tcl')
0 files changed, 0 insertions, 0 deletions