From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 24 Jan 2010 19:18:05 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.0-rc0~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=01ddb1ff41cdbd98e257aa4c119a7d51a21f80be;p=git.git

Merge branch 'maint'

* maint:
  git-gui: work from the .git dir
  git-gui: Fix applying a line when all following lines are deletions
  git-gui: Correct file_states when unstaging partly staged entry
  git-gui: Fix gitk for branch whose name matches local file
  git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync
  git-gui: handle really long error messages in updateindex.
  git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"
  git-gui: Makefile: consolidate .FORCE-* targets
---

01ddb1ff41cdbd98e257aa4c119a7d51a21f80be