]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'mg/reset-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:44:26 +0000 (12:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:44:26 +0000 (12:44 -0800)
commit109a8037a9c7d5dc5b93e637c663406159ab3a75
treeace521b8a99e055315d2f6763d4b7e5d20bc7e7b
parent71d35bdb3613b753dbd5b83992e298531f701b6b
parentd537c7492b7d16bf439ace7e31f8a9c0a7b617c3
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