From: Yann Dirson <dirson@bertin.fr>
To: git list <git@vger.kernel.org>
Subject: Re: Itches with the current rev spec
Date: Fri, 26 Apr 2013 10:19:46 +0200 [thread overview]
Message-ID: <20130426101946.433f2d12@chalon.bertin.fr> (raw)
In-Reply-To: <CALkWK0n97VLtiR96VEy86645NVoDL2rS-g7LBuLb=JpncdH6VA@mail.gmail.com>
>2. git rebase -i master fails unless I've rebased my branch on top of
>master. I always wished I could do the equivalent of 'git rebase -i
>master..', but I can't. Can we give the A..B syntax a new meaning in
>the context of rebase, namely $(git merge-base A B)?
If I understand well, you're refering to a problem that also annoys me,
ie. using "rebase -i" to just edit your local commits, without rebasing
onto the lastest revision on the upstream branch, right ? That is, just
another wart of having a single command for arguably-different use cases,
or of having the single-argument version of rebase use that argument for
2 very different things (cut-off point and destination), but I won't try
to address either of these today :)
In that case, what about just adding a new flag to "rebase -i", that would
prevent the single-argument to be interpreted as destination ? I really
consider this a workaround for a suboptimal CLI, but since we don't want
to change the rebase CLI before at least 2.0, that could fill the gap for now.
As for the flag itself, what about --here ? Obviously it would only be
meaninglful together with -i, and be exclusive with --onto.
--
Yann Dirson - Bertin Technologies
next prev parent reply other threads:[~2013-04-26 8:19 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-25 5:07 Itches with the current rev spec Ramkumar Ramachandra
2013-04-25 5:54 ` Ramkumar Ramachandra
2013-04-25 8:22 ` Matthieu Moy
2013-04-25 8:48 ` Felipe Contreras
2013-04-25 11:06 ` Ramkumar Ramachandra
2013-04-29 14:00 ` Michael J Gruber
2013-04-25 9:09 ` Andreas Schwab
2013-04-25 9:13 ` Ramkumar Ramachandra
2013-04-25 19:08 ` Phil Hord
2013-04-26 8:19 ` Yann Dirson [this message]
2013-04-26 8:43 ` Johannes Sixt
2013-04-26 12:33 ` Ramkumar Ramachandra
2013-04-26 17:49 ` Junio C Hamano
2013-04-26 19:48 ` Felipe Contreras
2013-04-26 21:13 ` Junio C Hamano
2013-04-29 15:08 ` Ramkumar Ramachandra
2013-04-29 15:37 ` Yann Dirson
2013-04-29 16:05 ` Junio C Hamano
2013-04-29 17:14 ` Ramkumar Ramachandra
2013-04-29 17:33 ` Junio C Hamano
2013-04-29 19:10 ` Ramkumar Ramachandra
2013-04-29 19:23 ` Ramkumar Ramachandra
2013-04-30 4:02 ` Junio C Hamano
2013-04-29 15:20 ` Ramkumar Ramachandra
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130426101946.433f2d12@chalon.bertin.fr \
--to=dirson@bertin.fr \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).