Re: Regression: rebase -C1 fails in master

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 13, 2018, 09:21 UTC
Message-ID: <nycvar.QRO.7.76.6.1811131019530.39@tvgsbejvaqbjf.bet>
In-Reply-To: <7c0f0b57-d303-d1fe-e551-c8783b5dbc17@talktalk.net>

Hi Phillip,

On Mon, 12 Nov 2018, Phillip Wood wrote:

Show 7 quoted lines

> I've just tried running
> 
> bin-wrappers/git rebase -C1 @^
> 
> and I get
> 
> error: unknown switch `1'

Darn. I think this is the same problem as the `-S` switch problem, but in reverse: the built-in rebase used to require an argument for `-S` (it should be optional, fixed in the meantime), but `-C` also has an optional argument.

Let me see whether I can fix this quickly.

Ciao, Dscho

Show 16 quoted lines

> usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>]
> [<upstream>] [<branch>]
>    or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>]
> --root [<branch>]
>    or: git rebase --continue | --abort | --skip | --edit-todo
> ...
> 
> bin-wrappers/git --version gives
> git version 2.19.1.856.g8858448bb4
> 
> Unfortunately I've not got time it investigate properly at the moment.
> 
> Best Wishes
> 
> Phillip
>