@matheusbsbs / matheus-bagliano / commits / 237ce836e7
Fork 0

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

Junio C Hamano committed Jul 12, 2007 at 14:12 UTC 237ce836e770e8ead12a14ee4a8170009fa4a40b

No changes.