Heya, On Fri, Oct 22, 2010 at 10:48, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > I doubt[*] 'git reset --merge' could be anything but a mistake when used > outside the context of a merge (remember that the plumbing is called > "read-tree", not "reset"). In that case, we should perhaps deprecate 'git reset --merge' and encourage users to use 'git merge --abort' instead. (I was thinking first that it doesn't make sense conceptually to have a command under 'git reset' that only works for merges, but we have the same with 'git checkout' already in the form of 'git checkout --ours', so perhaps it's ok to keep 'git reset --merge' then.) -- Cheers, Sverre Rabbelier -- 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