Documentation: merge: use MERGE_HEAD to refer to the remote branch

commit 57bddb11 (Documentation/git-merge: reword references to "remote" and "pull", 2010-01-07) fixed the manual to drop the assumption that the other branch being merged is from a remote repository. Unfortunately, in a few places, to do so it introduced the antecedentless phrase "their versions". Worse, in passages like the following, 'they' is playing two roles. | highlighting changes from both the HEAD and their versions. | | * Look at the diffs on their own. 'git log --merge -p <path>' Using HEAD and MERGE_HEAD nicely assigns terminology to "our" and "their" sides. It also provides the reader with practice using names that git will recognize on the command line. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch>

Jonathan Nieder committed Jan 23, 2010 at 16:48 UTC 3588cf94812d47dd34b82039c7776f5225a947fb

1 file changed +8 -6

Documentation/git-merge.txt

+8 -6

@@ -215,15 +215,17 @@ You can work through the conflict with a number of tools:

215 mergetool which will work you through the merge.

216

217 * Look at the diffs. `git diff` will show a three-way diff,

218 - highlighting changes from both the HEAD and their versions.

218 + highlighting changes from both the `HEAD` and `MERGE_HEAD`

219 + versions.

220

220 - * Look at the diffs on their own. `git log --merge -p <path>`

221 - will show diffs first for the HEAD version and then

222 - their version.

221 + * Look at the diffs from each branch. `git log --merge -p <path>`

222 + will show diffs first for the `HEAD` version and then the

223 + `MERGE_HEAD` version.

224

225 * Look at the originals. `git show :1:filename` shows the

225 - common ancestor, `git show :2:filename` shows the HEAD

226 - version and `git show :3:filename` shows their version.

226 + common ancestor, `git show :2:filename` shows the `HEAD`

227 + version, and `git show :3:filename` shows the `MERGE_HEAD`

228 + version.

229

230

231 EXAMPLES