diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-01-23 16:48:40 -0600 |
|---|---|---|
| committer | Thomas Rast <trast@student.ethz.ch> | 2010-01-24 13:57:59 +0100 |
| commit | 3588cf94812d47dd34b82039c7776f5225a947fb (patch) | |
| tree | b5747d6e87b5b714410b1f82e64e8194a53d059e /Documentation/git-merge.txt | |
| parent | ebef7e504913a1480310735af9541e26c0b381ba (diff) | |
| download | git-3588cf94812d47dd34b82039c7776f5225a947fb.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 6412805f06..e9e2b0cd9f 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -215,15 +215,17 @@ You can work through the conflict with a number of tools: mergetool which will work you through the merge. * Look at the diffs. `git diff` will show a three-way diff, - highlighting changes from both the HEAD and their versions. + highlighting changes from both the `HEAD` and `MERGE_HEAD` + versions. - * Look at the diffs on their own. `git log --merge -p <path>` - will show diffs first for the HEAD version and then - their version. + * Look at the diffs from each branch. `git log --merge -p <path>` + will show diffs first for the `HEAD` version and then the + `MERGE_HEAD` version. * Look at the originals. `git show :1:filename` shows the - common ancestor, `git show :2:filename` shows the HEAD - version and `git show :3:filename` shows their version. + common ancestor, `git show :2:filename` shows the `HEAD` + version, and `git show :3:filename` shows the `MERGE_HEAD` + version. EXAMPLES |