From: Junio C Hamano <junkio@cox.net>
Date: Sun, 18 Feb 2007 00:16:48 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~284
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=69bc0e22d37db4fa9875b717a64949bbfce4ebdf;p=git.git

Merge branch 'maint'

* maint:
  Update draft release notes for 1.5.0.1
  Convert update-index references in docs to add.
  Attempt to improve git-rebase lead-in description.
  Do not take mode bits from index after type change.
  git-blame: prevent argument parsing segfault
  Make gitk save and restore window pane position on Linux and Cygwin.
  Make gitk save and restore the user set window position.
  [PATCH] gitk: Use show-ref instead of ls-remote
  [PATCH] Make gitk work reasonably well on Cygwin.
  [PATCH] gitk - remove trailing whitespace from a few lines.
  Change git repo-config to git config
---

69bc0e22d37db4fa9875b717a64949bbfce4ebdf