Jeff King <peff@xxxxxxxx> writes: > And then on top of this (plus one-liner fix I posted), as Ping Yin > suggested, we can do: > > -- >8 -- > git-reset: default to --soft in a bare repo > > --mixed doesn't make sense, since we don't generally have an > index. > > Signed-off-by: Jeff King <peff@xxxxxxxx> > --- > This is a bit more contentious. There's no reason you can't have an > index in a bare repo, and this is changing the behavior of those who do. > They can always explicitly specify --mixed (since we haven't disallowed > that), but it might break some scripts. I'd prefer to error out if something does not make sense rather than defaulting differently depending on the bareness of the repository, but that is probably the matter of taste. Please re-raise the issue post 1.5.4 - 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