From: Junio C Hamano Date: Wed, 6 Oct 2010 19:10:26 +0000 (-0700) Subject: Merge branch 'mg/reset-doc' X-Git-Tag: v1.7.4-rc0~191 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a6fa2a87b78eda52a871d539e15a7493073b307a;p=git.git Merge branch 'mg/reset-doc' * 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 --- a6fa2a87b78eda52a871d539e15a7493073b307a