git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Henning Moll <newsScott@gmx.de>
To: git@vger.kernel.org
Subject: flatten-merge history
Date: Sat, 25 Oct 2014 14:31:53 +0200	[thread overview]
Message-ID: <544B9839.7000302@gmx.de> (raw)

Hi,

suppose the following history

     P - - - Q - - - - - R       <-extern

A -- - B - - - C - D - - - E   <-master
          \           \
           M ...       \         <-b1
                        \
                         W ...   <-b2


Note that master and extern do not have a common parent. Both histories 
are 'distinct', they do not share common files, so there can't be any 
merge conflicts. What i want to achieve is this history:

     P - - - Q - - - - - R       <-extern

A -P'- B'- Q'- C'- D'- R'- E'  <-master
          \           \
           M'...       \         <-b1
                        \
                         W'...   <-b2

The two histories should be merged in chronological order.
So while master reflects P-Q-R, b2 should only reflect P-Q and b1 should 
only reflect P.

All my current attempts (surgery with git replace or interactive rebase 
combined with merging) were not successfull.

Any ideas?

Best regards
Henning

             reply	other threads:[~2014-10-25 18:53 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-25 12:31 Henning Moll [this message]
2014-10-26  5:46 ` flatten-merge history Christian Couder
2014-10-26 14:36   ` Henning Moll
2014-10-26 15:19     ` Andreas Schwab
2014-10-26 19:02       ` Christian Couder
2014-10-26 23:45         ` Henning Moll
2014-10-27 18:45           ` Andreas Schwab

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=544B9839.7000302@gmx.de \
    --to=newsscott@gmx.de \
    --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).