Re: [PATCH 08/11] builtin rebase: support --force-rebase

2018-08-24 Thread Johannes Schindelin
Hi Stefan, On Wed, 8 Aug 2018, Stefan Beller wrote: > On Wed, Aug 8, 2018 at 6:51 AM Pratik Karki wrote: > > > @@ -551,10 +560,21 @@ int cmd_rebase(int argc, const char **argv, const > > char *prefix) > [...] > > ; /* be quiet */ > > else if

Re: [PATCH 08/11] builtin rebase: support --force-rebase

2018-08-08 Thread Stefan Beller
On Wed, Aug 8, 2018 at 6:51 AM Pratik Karki wrote: > @@ -551,10 +560,21 @@ int cmd_rebase(int argc, const char **argv, const char > *prefix) [...] > ; /* be quiet */ > else if (!strcmp(branch_name, "HEAD") && > -

[PATCH 08/11] builtin rebase: support --force-rebase

2018-08-08 Thread Pratik Karki
In this commit, we add support to `--force-rebase` option. The equivalent part of the shell script found in `git-legacy-rebase.sh` is converted as faithfully as possible to C. The --force-rebase option ensures that the rebase does not simply fast-forward even if it could. Signed-off-by: Pratik