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

Re: TopGit: how to deal with upstream inclusion

From
Petr Baudis <pasky@suse.cz>
Date
Sep 21, 2008, 14:19 UTC
Message-ID
<20080921141924.GI10360@machine.or.cz>
In-Reply-To
<20080919170406.GA22849@lapse.rw.madduck.net>
On Fri, Sep 19, 2008 at 06:04:06PM +0100, martin f krafft wrote:
Show 5 quoted lines
> also sprach Petr Baudis <pasky@suse.cz> [2008.09.14.2203 +0100]:
> >   (iii) Merge in RETIRED head branch with -s ours
> 
> Yes, it does. One might want to consider to make the use of -s ours
> in (iiii) configurable, but otherwise that's it.

That might be pretty dangerous, since then your topic branch will have outstanding branches of the retired branch, but they will _NOT_ be visible to tg patch and others since they will be in both the base and head.

-- 
				Petr "Pasky" Baudis
The next generation of interesting software will be done
on the Macintosh, not the IBM PC.  -- Bill Gates
Previous: martin f krafftNext: martin f krafft
Message 4 of 9 in “TopGit: how to deal with upstream inclusion”
  1. martin f krafftSep 14, 2008
  2. Petr BaudisSep 14, 2008
  3. martin f krafftSep 19, 2008
  4. Petr BaudisSep 21, 2008
  5. martin f krafftSep 23, 2008
  6. Petr BaudisSep 23, 2008
  7. martin f krafftSep 24, 2008
  8. Petr BaudisSep 24, 2008
  9. martin f krafftSep 24, 2008

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.