From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Jul 2007 08:45:56 +0000 (-0700)
Subject: Merge branch 'maint' of git://repo.or.cz/git-gui into maint
X-Git-Tag: v1.5.2.4~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5;p=git.git

Merge branch 'maint' of git://repo.or.cz/git-gui into maint

* 'maint' of git://repo.or.cz/git-gui:
  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
---

1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5