From: Junio C Hamano <gitster@pobox•com>
To: "Björn Steinbrink" <B.Steinbrink@gmx•de>
Cc: Johannes.Schindelin@gmx•de, git@vger•kernel.org
Subject: Re: [PATCH 1/1] Add --first-parent support to interactive rebase.
Date: Tue, 30 Oct 2007 22:05:27 -0700 [thread overview]
Message-ID: <7vodefj2lk.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 1193797309-1161-1-git-send-email-B.Steinbrink@gmx.de
Your MUA seems to mark the UTF-8 message you are sending out as
8859-1, which means your name in the message gets corrupt.
Björn Steinbrink <B.Steinbrink@gmx•de> writes:
> By default, rebase will take all commits from the branch that is to be
> rebased which are missing in upstream. The new --first-parent option
> allows to just follow the first parent and thus completely ignore
> merges.
>
> Additionally, when used together with --preserve-merges (which is the
> more useful use-case) it will no longer rebase the commits from the
> merged-in branches, but instead redo the merge with the original
> parents.
>
> That means that:
> ---H------I topicB
Please add a blank line after "means that:" for readability.
> / \ \
> ...
> does no longer become:
> -H'--------I'
Likewise; also, "no longer becomes:".
> / \ \
> D'---E'---F'---G' topicA
> /
> A---B---C master
> \
> H---I topicB
>
> but instead:
> A---B---C master
Likewise.
> ...
> ---------H---------I topicB
And crucially, you forgot to say "... when you do X".
I am assuming that you meant:
This (picture) becomes this (picture) instead of this (picture)
when you run "git rebase -p -m master topicA".
but without it, the nice ASCII drawings loses their value.
It is somewhat disturbing that this treats the first parent too
special.
next prev parent reply other threads:[~2007-10-31 5:05 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-31 2:21 [PATCH 1/1] Add --first-parent support to interactive rebase Björn Steinbrink
2007-10-31 3:34 ` Johannes Schindelin
2007-10-31 4:17 ` Björn Steinbrink
2007-10-31 4:50 ` Johannes Schindelin
2007-10-31 8:24 ` Wincent Colaiuta
2007-10-31 5:05 ` Junio C Hamano [this message]
2007-10-31 5:53 ` Björn Steinbrink
2007-10-31 13:43 ` Dmitry Potapov
2007-10-31 14:00 ` Karl Hasselström
2007-10-31 14:36 ` Dmitry Potapov
2007-10-31 18:05 ` Jeff King
2007-10-31 19:50 ` Björn Steinbrink
2007-10-31 21:53 ` Junio C Hamano
2007-10-31 21:56 ` Jeff King
2007-10-31 22:31 ` Junio C Hamano
2007-11-01 3:23 ` Jeff King
2007-11-01 4:10 ` Junio C Hamano
2007-11-01 4:14 ` Jeff King
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=7vodefj2lk.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=B.Steinbrink@gmx$(echo .)de \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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