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

Could this be done simpler?

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Jun 24, 2009, 21:35 UTC
Message-ID
<alpine.LFD.2.01.0906241426120.3154@localhost.localdomain>

Ok, so I have a practice of occasionally doing octopus merges when I have two branches with trivial fixes from the same person.

That all works fine when they use the "multiple branches in the same repository" approach (eg x86 "tip" tree), but other people tend to prefer to use multiple repositories for different features, rather than branches. And git generally lets you do things either way with no real difference.

But for the octopus case, it does make a difference. You can easily make octopus merges only from one repository.

Which is kind of sad. 

So I did kernel commit c6223048259006759237d826219f0fa4f312fb47 by basically doing the 'git pull" logic by hand, and while this was just a trial and maybe I'll never feel the urge to do it again, I'm wondering it maybe we should make it easier to do.

Right now the "git pull" syntax is
	git pull <repo> <branch>*
and you cannot specify multiple repositories, only multiple branches.

But at the same time, it should be pretty unambiguous whether an argument is a repository or a branch (':' in a remote repository, or "/" or ".." at the beginning of a local one - all invalid in branch names).

So it _should_ be syntactically unambiguous to allow
	git pull (<repo> <branch>*)+
for the octopus case. Hmm?
		Linus
Next: Junio C Hamano
Message 1 of 15 in “Could this be done simpler?”
  1. Linus TorvaldsJun 24, 2009
  2. Junio C HamanoJun 25, 2009
  3. Randal L. SchwartzJun 25, 2009
  4. Matthias AndreeJun 25, 2009
  5. Junio C HamanoJun 25, 2009
  6. Matthias AndreeJun 25, 2009
  7. Junio C HamanoJun 27, 2009
  8. Junio C HamanoJun 25, 2009
  9. Michael J GruberJun 25, 2009
  10. Christian CouderJun 25, 2009
  11. Christian CouderJun 25, 2009
  12. Junio C HamanoJun 25, 2009
  13. Linus TorvaldsJun 25, 2009
  14. Junio C HamanoJun 25, 2009
  15. Christian CouderJun 25, 2009

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.