git/list[1] front-page[2] threads[3] people[4] search[5] about
 

rebase planning: determining blobs changed by multiple branches

From
NKNeal Kreitzinger <neal@rsss.com>
Date
Feb 8, 2011, 00:41 UTC
Message-ID
<iiq3kb$aiv$1@dough.gmane.org>

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: Marc Weber
Message 1 of 3 in “rebase planning: determining blobs changed by multiple branches”
  1. Neal KreitzingerFeb 8, 2011
  2. Marc WeberFeb 8, 2011
  3. Neal KreitzingerFeb 8, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.