Avery Pennarun wrote: > On Mon, Dec 1, 2008 at 12:30 PM, Linus Torvalds > <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: >> So add this kind of mode to "git reset", and since it's probably the >> sanest form of reset (it will not throw any state away), just call it >> that: "git reset --sane". It should probably be the default, but we likely >> cannot change the semantics of a regular "git reset", even though it is >> unlikely that very many people really use the current (insane) default >> mode of "--mixed" that only resets the index. [...] > How about calling it --merge instead? That's really what it does: > merges the diffs from (your current index) to (the requested index) > into (your working tree and your index). I like it, because it is similar to how "git checkout --merge" works. > Or --keep, because it keeps your working tree changes. That is also better than --sane... -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -- 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
