On Sat, Nov 27, 2010 at 8:05 PM, Martin von Zweigbergk <martin.von.zweigbergk@xxxxxxxxx> wrote: > > On Sun, 28 Nov 2010, Sverre Rabbelier wrote: > >> Heya, >> >> On Sat, Nov 27, 2010 at 12:15, Giuseppe Bilotta >> <giuseppe.bilotta@xxxxxxxxx> wrote: >> > -p:: >> > --preserve-merges:: >> > Instead of ignoring merges, try to recreate them. >> > + >> > +--signoff:: >> > + This flag is passed to 'git am' to sign off all the rebased >> > + commits (see linkgit:git-am[1]). >> > + Incompatible with the --interactive option. >> >> The one above that does have a shorthand (-p), why should we (not?) >> give --signoff it's customary -s shorthand here? > > The '-s' flag is unfortunately already taken. It is used for > specifying a merge strategy. In fact, this is why I was a little skeptical myself about submitting this patch. What if people start remembering that rebase supports --signoff and implicity assume that -s is also a valid shortcut? Funky errors. (I've been bittem myself by similar situations for whitespace support. Can I pass -b or not? Will it mean --ignore-whitespace?) -- Giuseppe "Oblomov" Bilotta -- 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