From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Nov 2010 20:44:26 +0000 (-0800)
Subject: Merge branch 'mg/reset-doc' into maint
X-Git-Tag: v1.7.3.3~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=109a8037a9c7d5dc5b93e637c663406159ab3a75;p=thirdparty%2Fgit.git

Merge branch 'mg/reset-doc' into maint

* mg/reset-doc:
  git-reset.txt: make modes description more consistent
  git-reset.txt: point to git-checkout
  git-reset.txt: use "working tree" consistently
  git-reset.txt: reset --soft is not a no-op
  git-reset.txt: reset does not change files in target
  git-reset.txt: clarify branch vs. branch head
---

109a8037a9c7d5dc5b93e637c663406159ab3a75