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

Re: [PATCH] Documentation/git-merge.txt: Expand the How Merge Works section

From
Petr Baudis <pasky@suse.cz>
Date
Jul 17, 2008, 16:42 UTC
Message-ID
<20080717164219.GX32184@machine.or.cz>
In-Reply-To
<20080717162922.12081.96582.stgit@localhost>
On Thu, Jul 17, 2008 at 06:29:32PM +0200, Petr Baudis wrote:
>  foo                         |    1 
>  2 files changed, 59 insertions(+), 35 deletions(-)
>  create mode 100644 foo

*Cough* Sorry about this. I think there is currently no need to merge the 'foo' bit. ;-)

				Petr "Pasky" Baudis
Previous: Petr BaudisNext: Junio C Hamano
Message 2 of 9 in “Documentation/git-merge.txt: Expand the How Merge Works section”
  1. Documentation/git-merge.txt: Expand the How Merge Works sectionPetr Baudis, Jul 17, 2008
  2. Petr BaudisJul 17, 2008
  3. Junio C HamanoJul 17, 2008
  4. Petr BaudisJul 17, 2008
  5. Junio C HamanoJul 17, 2008
  6. Petr BaudisJul 18, 2008
  7. Documentation/git-merge.txt: Partial rewrite of How Merge WorksPetr Baudis, Jul 18, 2008
  8. Junio C HamanoJul 19, 2008
  9. Documentation/git-merge.txt: Partial rewrite of How Merge WorksPetr Baudis, Jul 19, 2008

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.