2011/3/30 Jonathan Nieder <jrnieder@xxxxxxxxx>: > 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html