From: "Neal Kreitzinger" <neal@rsss.com>
To: git@vger.kernel.org
Subject: rebase planning: determining blobs changed by multiple branches
Date: Mon, 7 Feb 2011 18:41:44 -0600 [thread overview]
Message-ID: <iiq3kb$aiv$1@dough.gmane.org> (raw)
We have 15 branches that are unmerged, but are based on the same published
history. They branched off at different points in the history. Each branch
is comprised of a single squashed commit (except for master). How can I
compare all 15 branches with the tip of master to see which file merges
(blobs) they have in common?
a-------b-------c-------d-------e-------f-------g-------i-------j-------k-------l
| | | | | |
| | |---k1
| | | | | |
| |---j1
| | | | | |
|---i1
| | | | |
|---g1
| | | | |---e1
| | | | |---e2
| | | | |---e3
| | | |---d1
| | | |---d2
| | | |---d3
| | |---c1
| | |---c2
| |---b1
| |---b2
|---a1
The goal is to create a sane plan for rebasing. If the question is insane
as it is stated, then please advise on any sane ways to approach this
besides just rebasing one-by-one and making the last poor branch wait till
the end to rebase with a ton of conflicts. I'm dealing with users who
refuse to do frequent rebases, so a plan the minimizes rebases while getting
the most out of each rebase is desired, if practical.
v/r,
Neal
next reply other threads:[~2011-02-08 0:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-08 0:41 Neal Kreitzinger [this message]
2011-02-08 0:59 ` rebase planning: determining blobs changed by multiple branches Marc Weber
2011-02-08 1:27 ` Neal Kreitzinger
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='iiq3kb$aiv$1@dough.gmane.org' \
--to=neal@rsss.com \
--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).