From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 21 Oct 2007 06:11:45 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~331
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8a37e21dab1103e11630d091c13be21d958221c1;p=git.git

Merge branch 'maint'

* maint:
  Describe more 1.5.3.5 fixes in release notes
  Fix diffcore-break total breakage
  Fix directory scanner to correctly ignore files without d_type
  Improve receive-pack error message about funny ref creation
  fast-import: Fix argument order to die in file_change_m
  git-gui: Don't display CR within console windows
  git-gui: Handle progress bars from newer gits
  git-gui: Correctly report failures from git-write-tree
  gitk.txt: Fix markup.
  send-pack: respect '+' on wildcard refspecs
  git-gui: accept versions containing text annotations, like 1.5.3.mingw.1
  git-gui: Don't crash when starting gitk from a browser session
  git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk
  git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs
  git-gui: Handle starting on mapped shares under Cygwin
  git-gui: Display message box when we cannot find git in $PATH
  git-gui: Avoid using bold text in entire gui for some fonts
---

8a37e21dab1103e11630d091c13be21d958221c1