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

Re: [PATCH] Documentation: clarify commits affected by gitk --merge

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 7, 2009, 21:45 UTC
Message-ID
<7vtz75udj6.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20090206044053.GA6831@atcmail.atc.tcs.com>
Sitaram Chamarty <sitaramc@gmail.com> writes:
Show 5 quoted lines
>  	After an attempt to merge stops with conflicts, show the commits on
>  	the history between two branches (i.e. the HEAD and the MERGE_HEAD)
> -	that modify the conflicted files.
> +	that modify the conflicted files and do not exist on all the heads
> +	being merged.
I do not understand what you are trying to add here, sorry.
Previous: Sitaram ChamartyNext: Sitaram Chamarty
Message 2 of 3 in “Documentation: clarify commits affected by gitk --merge”
  1. Documentation: clarify commits affected by gitk --mergeSitaram Chamarty, Feb 6, 2009
  2. Junio C HamanoFeb 7, 2009
  3. Sitaram ChamartyFeb 8, 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.