| commit | 8c0db6fd51cec5fd82cf4054818c0a1ca4a58f37 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Fri, 21 Jan 2011 18:37:34 +0000 (21 12:37 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Jan 2011 20:41:14 +0000 (21 12:41 -0800) | ||
| tree | b563f3ee12a439303b975a804f8dec9f2ff1c44a | treesnapshot (tar.gz zip) |
| parent | 25f3af3f9d351a3d50cb9fc2bf7bddf941e4bc58 | commitdiff |
Documentation: do not treat reset --keep as a special case
The current treatment of "git reset --keep" emphasizes how it
differs from --hard (treatment of local changes) and how it breaks
down into plumbing (git read-tree -m -u HEAD <commit> followed by git
update-ref HEAD <commit>). This can discourage people from using
it, since it might seem to be a complex or niche option.
Better to emphasize what the --keep flag is intended for --- moving
the index and worktree from one commit to another, like "git checkout"
would --- so the reader can make a more informed decision about the
appropriate situations in which to use it.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The current treatment of "git reset --keep" emphasizes how it
differs from --hard (treatment of local changes) and how it breaks
down into plumbing (git read-tree -m -u HEAD <commit> followed by git
update-ref HEAD <commit>). This can discourage people from using
it, since it might seem to be a complex or niche option.
Better to emphasize what the --keep flag is intended for --- moving
the index and worktree from one commit to another, like "git checkout"
would --- so the reader can make a more informed decision about the
appropriate situations in which to use it.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-reset.txt | diffblobblamehistory |