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

Re: [DRAFT] Branching and merging with git

From
Jakub Narebski <jnareb@gmail.com>
Date
Nov 18, 2006, 00:32 UTC
Message-ID
<ejlk82$av5$1@sea.gmane.org>
In-Reply-To
<20061118001355.23488.qmail@science.horizon.com>
linux@horizon.com wrote:
[...]
> (Are there any octopus merges in git's history?  If not, could I ask
> for one for pedagogical value?)

See commit d425142e2a045a9dd7879d028ec68bd748df48a3 (most legged octopus I found in git.git repository). Doing git-rev-parse --parents -all, or git log --all and greppoing for merges is a good idea to find octopi.

The commit is both v1.1.2-gd425142 (git describe) and tags/v1.2.0^0~143 (git name-rev --tags)

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Previous: linux@horizon.comNext: Junio C Hamano
Message 3 of 10 in “Re: [DRAFT] Branching and merging with git”
  1. J. Bruce FieldsNov 17, 2006
  2. linux@horizon.comNov 18, 2006
  3. Jakub NarebskiNov 18, 2006
  4. Junio C HamanoNov 18, 2006
  5. J. Bruce FieldsNov 19, 2006
  6. Git manualsPetr Baudis, Nov 19, 2006
  7. Jakub NarebskiNov 19, 2006
  8. Robin RosenbergNov 19, 2006
  9. J. Bruce FieldsNov 19, 2006
  10. Documentation: add a "git user's manual"J. Bruce Fields, Nov 26, 2006

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.