From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 24 Aug 2018 16:10:11 GMT
Subject: Re: [PATCH 08/11] builtin rebase: support --force-rebase
Message-ID: <nycvar.QRO.7.76.6.1808241809110.73@tvgsbejvaqbjf.bet>
In-Reply-To: <CAGZ79ka1uokeUzyZ37=o7J0Tu0k8P4fKj8hv8L-GpktU5i7+mQ@mail.gmail.com>

Hi Stefan,

On Wed, 8 Aug 2018, Stefan Beller wrote:

> On Wed, Aug 8, 2018 at 6:51 AM Pratik Karki <predatoramigo@gmail.com> wrote:
> 
> > @@ -551,10 +560,21 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> [...]
> >                         ; /* be quiet */
> >                 else if (!strcmp(branch_name, "HEAD") &&
> > -                       resolve_ref_unsafe("HEAD", 0, NULL, &flag))
> > +                        resolve_ref_unsafe("HEAD", 0, NULL, &flag))
> 
> This line is changing only the indentation whitespace?
> Would it make sense to have it in the previous patch?

Correct. I will fix this before sending the next iteration,
Dscho