* Regression: rebase -C1 fails in master
@ 2018-11-12 18:33 Phillip Wood
2018-11-13 9:21 ` Johannes Schindelin
0 siblings, 1 reply; 2+ messages in thread
From: Phillip Wood @ 2018-11-12 18:33 UTC (permalink / raw)
To: Git Mailing List, Johannes Schindelin, Pratik Karki
I've just tried running
bin-wrappers/git rebase -C1 @^
and I get
error: unknown switch `1'
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Regression: rebase -C1 fails in master
2018-11-12 18:33 Regression: rebase -C1 fails in master Phillip Wood
@ 2018-11-13 9:21 ` Johannes Schindelin
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2018-11-13 9:21 UTC (permalink / raw)
To: phillip.wood; +Cc: Git Mailing List, Pratik Karki
Hi Phillip,
On Mon, 12 Nov 2018, Phillip Wood wrote:
> 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
> 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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-13 9:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-12 18:33 Regression: rebase -C1 fails in master Phillip Wood
2018-11-13 9:21 ` Johannes Schindelin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).