Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > Sadly, at least the user manual change suggested below is probably > not suitable, since reset --keep and --merge have not been around > since git 1.5.3 days. Ideas for working around that and other > comments would be welcome. Do we really want to keep the user manual compatible with 1.5.3 forever? It's nice to keep the user manual usable by slightly outdated Gits, but 1.5.3 starts being really old, and older docs are still available on the web (like http://www.kernel.org/pub/software/scm/git/docs/v1.5.3.8/git.html ). git reset --merge appeared in Git 1.6.2, it sounds reasonable to say the current user manual works from this version. git reset --keep appeared in 1.7.1, hence far more recently. But I think it can still be mentionned at least as an alternative to --hard. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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