From: Thomas Rast <trast@student.ethz.ch>
To: <weigelt@metux.de>
Cc: <git@vger.kernel.org>, <leonidp.lists@gmail.com>,
Johannes Sixt <j.sixt@viscovery.net>
Subject: Re: Rebasing multiple branches
Date: Fri, 31 Dec 2010 15:55:26 +0100 [thread overview]
Message-ID: <201012311555.26354.trast@student.ethz.ch> (raw)
In-Reply-To: <20101230053530.GA10511@nibiru.local>
Please don't cull the Cc lists. Unless he's subscribed, Leonid never
got your reply!
Enrico Weigelt wrote:
> * Leonid Podolny <leonidp.lists@gmail.com> wrote:
>
> > Ah, nice. I didn't notice the -p option. However, the man page advises
> > against using -p and -i together.
>
> Last time I checked, -i required -p ...
-p internally implies -i, but the user doesn't have to know that ;-)
The problem is that the todo file language is not expressive enough
for what -p needs to do. Running a rebase -p without changing the
todo file should behave reasonably. On the other hand, if you
rearrange or extend the todo file in many cases that gives unexpected
results.
Hence the recommendation to not use it with -i.
--
Thomas Rast
trast@{inf,student}.ethz.ch
prev parent reply other threads:[~2010-12-31 14:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-21 13:40 Rebasing multiple branches Leonid Podolny
2010-12-21 14:06 ` Johannes Sixt
2010-12-22 14:36 ` Enrico Weigelt
2010-12-22 14:54 ` Leonid Podolny
2010-12-30 5:35 ` Enrico Weigelt
2010-12-31 14:55 ` Thomas Rast [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201012311555.26354.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=leonidp.lists@gmail.com \
--cc=weigelt@metux.de \
/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).