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

Re: [PATCH] core-tutorial: Use new syntax for git-merge.

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 30, 2007, 20:05 UTC
Message-ID
<7v640ol667.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<87lk9k4bvp.fsf@osv.gnss.ru>
Sergei Organov <osv@javad.com> writes:
> The patch below turns core-tutorial to use new syntax for
> git-merge. Please take close look at the last diff chunk, -- I'm not sure I
> got it right as it didn't have HEAD in the original version, -- was it already
> wrong before the patch?
You do not want the extra 'master' there.
Show 9 quoted lines
> @@ -1607,8 +1607,8 @@ in both of them.  You could merge in 'diff-fix' first and then
>  'commit-fix' next, like this:
>  
>  ------------
> -$ git merge 'Merge fix in diff-fix' master diff-fix
> -$ git merge 'Merge fix in commit-fix' master commit-fix
> +$ git merge -m 'Merge fix in diff-fix' master diff-fix
> +$ git merge -m 'Merge fix in commit-fix' master commit-fix
>  ------------

The example is working on 'master' branch at this point and HEAD and 'master' are equivalent there.

Previous: Sergei Organov
Message 2 of 2 in “core-tutorial: Use new syntax for git-merge.”
  1. core-tutorial: Use new syntax for git-merge.Sergei Organov, Oct 30, 2007
  2. Junio C HamanoOct 30, 2007

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.