summaryrefslogtreecommitdiff
path: root/git-gui/lib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-12 21:12:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-12 21:12:38 (GMT)
commit237ce836e770e8ead12a14ee4a8170009fa4a40b (patch)
tree8090c4161855bfd3073daf37626b0ee12d6f5862 /git-gui/lib
parentd972cce06da6e4e6cfcdce8417910bb4a7772ae2 (diff)
parentffb293b63d13b3b06b454a5f9f0ff6802ef15f0d (diff)
downloadgit-237ce836e770e8ead12a14ee4a8170009fa4a40b.zip
git-237ce836e770e8ead12a14ee4a8170009fa4a40b.tar.gz
git-237ce836e770e8ead12a14ee4a8170009fa4a40b.tar.bz2
Merge branch 'maint'
* maint: GIT 1.5.2.4 Teach read-tree 2-way merge to ignore intermediate symlinks git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree} git-gui: Don't linewrap within console windows git-gui: Correct ls-tree buffering problem in browser git-gui: Skip nicknames when selecting author initials git-gui: Ensure windows shortcuts always have .bat extension git-gui: Include a Push action on the left toolbar git-gui: Bind M1-P to push action git-gui: Don't bind F5/M1-R in all windows git-gui: Unlock the index when cancelling merge dialog git-gui: properly popup error if gitk should be started but is not installed
Diffstat (limited to 'git-gui/lib')
0 files changed, 0 insertions, 0 deletions