summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-04-17 17:16:56 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-04-17 17:16:56 -0700
commitc182ec90d824168cfb70494bb920c0a2fb590d98 (patch)
treeb707c9feab812236a6cd95798ba2f8323adec055 /git-merge-stupid.sh
parentMerge branch 'jc/read-tree-df' (diff)
parentgit-gui: Honor TCLTK_PATH if supplied (diff)
downloadtgif-c182ec90d824168cfb70494bb920c0a2fb590d98.tar.xz
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui: git-gui: Honor TCLTK_PATH if supplied Revert "Allow wish interpreter to be defined with TCLTK_PATH" git-gui: Display the directory basename in the title git-gui: Brown paper bag fix division by 0 in blame Always bind the return key to the default button Do not break git-gui messages into multiple lines. Improve look-and-feel of the git-gui tool. Teach git-gui to use the user-defined UI font everywhere. Allow wish interpreter to be defined with TCLTK_PATH
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions