From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Jul 2007 21:12:38 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc1~17
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=237ce836e770e8ead12a14ee4a8170009fa4a40b;p=git.git

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
---

237ce836e770e8ead12a14ee4a8170009fa4a40b