Re: [PATCH] reset: update help text

2011/3/30 Jonathan Nieder [off-list ref]:

The description does not make it obvious to me how these two (--merge
and --keep) differ.  I think the intent of the options are:

 --keep:
       start working on a different commit, carrying over local changes
       (like "git checkout")
 --merge:
       return to <commit>, cancelling a merge-like operation that
       creates some unmerged and some clean index entries

Maybe something along these lines could be ok starting point?

       OPT_SET_INT(0, "keep", &reset_type,
               "move to <commit>, carrying over local changes in working tree",
               KEEP),
       OPT_SET_INT(0, "merge", &reset_type,
               "return to <commit>, cancelling failed merge or cherry-pick",
               MERGE),

To be honest, I have no idea what the above describes. I read 9bc454d
(reset: add option "--keep" to "git reset" - 2010-01-19) and figured
that --keep is like --merge except that "git diff" before and after
the reset is exactly the same, is it? I have never used --keep before.
-- 
Duy