Code

Merge branch 'mg/reset-doc' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Sep 2010 16:38:57 +0000 (09:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Sep 2010 16:38:57 +0000 (09:38 -0700)
commit2a10b71f738b8b77ba8d243574f537a54dbf9a62
tree80f3c59f9fb8c4edd70df59e5eab3407abf7f6c3
parent12f7559e0634c4b4348924cd7bfc70558d082eb8
parentd537c7492b7d16bf439ace7e31f8a9c0a7b617c3
Merge branch 'mg/reset-doc' into next

* 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