Ramkumar Ramachandra wrote: > Jonathan Nieder writes: >> The -s thing doesn't have much to do with this change. But is it a >> bug or not? If it's not a bug, then this is not so much a glitch to >> note as an important feature to ensure people don't sign off on a >> conflict resolution without thinking about it. (I guess I think it's >> a bug. It's hard to decide.) > > Bug, definitely. It happens because unlike "-x" where the > cherry-picking machinery appends to the commit message, "-s" is > handled at commit-time (when it spawns `git commit`). Ofcourse, if I > were never to write the sequencing features, this would never been > seen as a bug -- hence the term "glitch"; an implementation detail > that doesn't suit our future plans (namely, this series) very well. Hmm, I thought I remembered this coming up previously and Junio mentioning that it was intentional (maybe in the context of CHERRY_HEAD?), but I haven't been able to find the relevant message. -- 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