From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Sep 2010 22:26:40 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~202
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=92b87a9bab1a84261d2381e813e58577967bdc79;p=git.git

Merge branch 'master' into next

* master:
  Start 1.7.4 cycle
  MinGW: avoid collisions between "tags" and "TAGS"
  diff: trivial fix for --output file error message
  user-manual: fix anchor name Finding-comments-With-given-Content
  user-manual: be consistent in illustrations to 'git rebase'
  stash: simplify parsing fixes
  Git 1.7.3.1
  stash: fix git stash branch regression when branch creation fails
  stash drops the stash even if creating the branch fails because it already exists
---

92b87a9bab1a84261d2381e813e58577967bdc79