>> squash [<options>] --from <mark>:: >> Squash all commits from the given mark into one commit. >> There must not be any `merge` instructions between the >> `mark` instruction and this `squash --from` instruction. > > --after maybe? I have no idea what is best here ;-) Something that seems intuitive when you see: merge ... mark :5 pick 666babe patch foo.patch pick fa1afe1 Now? 1) squash --up-to :5 2) squash --from :5 3) squash --after :5 (1) suggests the wrong direction... My English feeling says that (2) "squash from" is better than (3) "squash after", but I'm not a native speaker ;-) Regards, Stephan -- Stephan Beyer <s-beyer@xxxxxxx>, PGP 0x6EDDD207FCC5040F -- 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
