Re: [PATCH] core-tutorial: Use new syntax for git-merge.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:45
Sergei Organov [off-list ref] 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.
quoted hunk
@@ -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.