From: Johannes Sixt <j.sixt@viscovery•net>
To: Stephen Haberman <stephen@exigencecorp•com>
Cc: git@vger•kernel.org
Subject: Re: rebasing merges
Date: Tue, 23 Sep 2008 10:00:09 +0200 [thread overview]
Message-ID: <48D8A209.6090708@viscovery.net> (raw)
In-Reply-To: <20080923024653.a3bb8666.stephen@exigencecorp.com>
Stephen Haberman schrieb:
>> This is the expected behavior and not up for debate.
>
> Cool, thanks for the reply. However, I debate... :-)
>
>> ---o--o--o--o--o--o <-- origin
>> \
>> A'--B' <-- master
>
> Nice. That makes sense in your scenario.
>
> Here is mine:
I understand your problem very well. pull --rebase does not help your case
because it was not designed for your workflow (it was designed to help the
one that I sketched).
You are probably better served using fetch + rebase -i -p.
-- Hannes
next prev parent reply other threads:[~2008-09-23 8:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-22 20:57 rebasing merges Stephen Haberman
2008-09-23 4:19 ` Stephen Haberman
2008-09-23 6:09 ` Johannes Sixt
2008-09-23 7:30 ` Samuel Tardieu
2008-09-23 7:52 ` Johannes Sixt
2008-09-23 8:06 ` Andreas Ericsson
2008-09-23 7:46 ` Stephen Haberman
2008-09-23 8:00 ` Johannes Sixt [this message]
2008-09-23 8:20 ` Andreas Ericsson
2008-09-23 9:03 ` Stephen Haberman
2008-09-23 9:11 ` Andreas Ericsson
2008-09-23 9:30 ` Stephen Haberman
2008-09-23 18:29 ` Stephen Haberman
2008-09-23 11:16 ` SZEDER Gábor
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=48D8A209.6090708@viscovery.net \
--to=j.sixt@viscovery$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=stephen@exigencecorp$(echo .)com \
/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