From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Thu, 17 Feb 2011 03:41:55 GMT
Subject: Re: [PATCH v2 00/31] refactor rebase
Message-ID: <alpine.DEB.2.00.1102162212360.14950@debian>
In-Reply-To: <4D5BE49D.1040402@viscovery.net>

On Wed, 16 Feb 2011, Johannes Sixt wrote:

> There's one annoying regression with this series: It does not accept
> abbreviated options anymore. In particular, 'git rebase --cont' is now an
> error. I use this a lot since I don't have command completion. This used
> to work (only) with interactive rebase.

Sorry about that :-(. That must of course be because I removed the
OPTIONS_SPEC from git-rebase--interactive.sh. Sounds like I should add
it back in git-rebase.sh. Can someone explain what the
OPTIONS_KEEPDASHDASH is for? Should I add that as well?

> And a side note: the error message is -- during a rebase that stopped at
> an 'edit' instruction:
> 
> $ git rebase --cont
> Usage: git rebase [--interactive | -i] [-v] [--force-rebase | -f]
> [--no-ff] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q]
> 
> It nowhere mentions --continue, --skip, --abort etc. That's perhaps worth
> fixing.

Makes sense. If others agree, I will add that as well.

/Martin