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

Re: [PATCH] Only warn about missing branch.<n>.merge in pull.

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 19, 2006, 10:30 UTC
Message-ID
<Pine.LNX.4.63.0612191128500.19693@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<200612190159.58658.Josef.Weidendorfer@gmx.de>
Hi,
On Tue, 19 Dec 2006, Josef Weidendorfer wrote:
Show 11 quoted lines
> On Monday 18 December 2006 21:43, Johannes Schindelin wrote:
>
> > However, I would actually reuse our versatile (often hated?) config  
> > handling:
> > 
> > [branch "xyz"]
> > 	remote = blabla # this is the default remote
> > 	merge = master # this is the default branch for the default remote
> > 	merge = pu for remote second # merge 'pu' if pulling from second
> 
> Looks a little bit confusing, but is fine with me.
Granted. Suggestions?
> I even would remove the need for the word "remote" in the second merge 
> line.
No. In Git, a line like
	blabla
would turn into a boolean named "blabla" being true.

Ciao, Dscho

Previous: Junio C HamanoNext: Shawn Pearce
Message 7 of 8 in “Only warn about missing branch.<n>.merge in pull.”
  1. Only warn about missing branch.<n>.merge in pull.Shawn O. Pearce, Dec 18, 2006
  2. Santi BéjarDec 18, 2006
  3. Josef WeidendorferDec 19, 2006
  4. Junio C HamanoDec 19, 2006
  5. Johannes SchindelinDec 19, 2006
  6. Junio C HamanoDec 19, 2006
  7. Johannes SchindelinDec 19, 2006
  8. Shawn PearceDec 19, 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.