summaryrefslogtreecommitdiff
path: root/diff-delta.c
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-01-21 12:37:34 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-01-21 12:41:14 -0800
commit8c0db6fd51cec5fd82cf4054818c0a1ca4a58f37 (patch)
treeb563f3ee12a439303b975a804f8dec9f2ff1c44a /diff-delta.c
parentCorrectly report corrupted objects (diff)
downloadtgif-8c0db6fd51cec5fd82cf4054818c0a1ca4a58f37.tar.xz
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>
Diffstat (limited to 'diff-delta.c')
0 files changed, 0 insertions, 0 deletions