Code

Documentation: merge: use MERGE_HEAD to refer to the remote branch
authorJonathan Nieder <jrnieder@gmail.com>
Sat, 23 Jan 2010 22:48:40 +0000 (16:48 -0600)
committerThomas Rast <trast@student.ethz.ch>
Sun, 24 Jan 2010 12:57:59 +0000 (13:57 +0100)
commit3588cf94812d47dd34b82039c7776f5225a947fb
treeb5747d6e87b5b714410b1f82e64e8194a53d059e
parentebef7e504913a1480310735af9541e26c0b381ba
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>
Documentation/git-merge.txt