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

Re: Feature request: git-pull -e/--edit

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Nov 21, 2006, 09:19 UTC
Message-ID
<Pine.LNX.4.63.0611211018040.13772@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<4561FDA9.6060807@tromer.org>
Hi,
On Mon, 20 Nov 2006, Eran Tromer wrote:
Show 7 quoted lines
> On 2006-11-20 19:09, Horst H. von Brand wrote:
> >>
> >>   A------------F master
> >>    \          /
> >>     B--C--D--E
> >>
> >> Yes, E and F have identical trees.

There has been only _one_ line of history, so why introduce what was not there?

It sounds more like you do not trust "E" to be something especially useful, but in that case you should not merge it to begin with.

Ciao,
Previous: Eran Tromer
Message 5 of 5 in “Re: Feature request: git-pull -e/--edit”
  1. Eran TromerNov 20, 2006
  2. Horst H. von BrandNov 20, 2006
  3. Petr BaudisNov 20, 2006
  4. Eran TromerNov 20, 2006
  5. Johannes SchindelinNov 21, 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.