Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> writes: > Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> > --- > Regression: "-M" is gone. Don't really want to mess up struct option for "-M" > > Makefile | 2 +- > builtin-rebase.c | 992 ++++++++++++++++++++++++++++++++++++++++ > builtin.h | 1 + > contrib/examples/git-rebase.sh | 530 +++++++++++++++++++++ > git-rebase.sh | 530 --------------------- > git.c | 1 + > 6 files changed, 1525 insertions(+), 531 deletions(-) > create mode 100644 builtin-rebase.c > create mode 100755 contrib/examples/git-rebase.sh > delete mode 100755 git-rebase.sh You should have used -M option to git-format-patch to make it clear that this patch moves git-rebase.sh to contrib/examples/git-rebase.sh without changes. [...] > +#define REBASE_ABORT 0x0001 > +#define REBASE_CONTINUE 0x0002 > +#define REBASE_FORCE 0x0004 > +#define REBASE_IGNORE_DATE 0x0008 > +#define REBASE_INTERACTIVE 0x0010 > +#define REBASE_MERGE 0x0020 > +#define REBASE_STAT 0x0040 > +#define REBASE_NO_VERIFY 0x0080 > +#define REBASE_PRESERVE_MERGES 0x0100 > +#define REBASE_ROOT 0x0200 > +#define REBASE_SKIP 0x0400 > +#define REBASE_VERBOSE 0x0800 I see misaligns here... [...] Couldn't you use parseopt also in subcommands? -- Jakub Narebski 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