From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: phillip.wood@dunelm.org.uk
Cc: Git Mailing List <git@vger.kernel.org>,
Pratik Karki <predatoramigo@gmail.com>
Subject: Re: Regression: rebase -C1 fails in master
Date: Tue, 13 Nov 2018 10:21:13 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1811131019530.39@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <7c0f0b57-d303-d1fe-e551-c8783b5dbc17@talktalk.net>
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
>
prev parent reply other threads:[~2018-11-13 9:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-12 18:33 Regression: rebase -C1 fails in master Phillip Wood
2018-11-13 9:21 ` Johannes Schindelin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1811131019530.39@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=phillip.wood@dunelm.org.uk \
--cc=predatoramigo@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).