diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2010-09-15 22:47:41 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-18 15:14:19 -0700 |
| commit | cca5d0b04aa78c048239a0d5c36174f04d6d7f3a (patch) | |
| tree | 728cc9203bef9843ea814f621841966f2c11ea49 /Documentation/merge-strategies.txt | |
| parent | aad8441483408119ea19d4cf9e5cccb4a7a3639d (diff) | |
| download | git-cca5d0b04aa78c048239a0d5c36174f04d6d7f3a.tar.gz git-cca5d0b04aa78c048239a0d5c36174f04d6d7f3a.tar.xz | |
git-reset.txt: reset --soft is not a no-op
Make it clearer that git reset --soft actually does something (changing
HEAD). While it is mentioned in the previous paragraph already it can
be easily overlooked otherwise.
Also, git reset --soft does not look at the index nor the worktree, so
there is no "good order" requirement.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions