Documentation/git-merge: reword references to "remote" and "pull"
The git-merge manpage was written in terms of merging a "remote", which is no longer the case: you merge local or remote-tracking branches; pull is for actual remotes. Adjust the manpage accordingly. We refer to the arguments as "commits", and change instances of "remote" to "other" (where branches are concerned) or "theirs" (where conflict sides are concerned). Remove the single reference to "pulling". Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Thomas Rast committed
Jan 7, 2010 at 17:32 UTC
57bddb115331a23816af772172531fb56fceace4
1 file changed
+17
-17
Documentation/git-merge.txt
+17
-17
@@ -10,17 +10,17 @@ SYNOPSIS
10
--------
11
[verse]
12
'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
13
- [-m <msg>] <remote>...
14
-'git merge' <msg> HEAD <remote>...
13
+ [-m <msg>] <commit>...
14
+'git merge' <msg> HEAD <commit>...
15
16
DESCRIPTION
17
-----------
18
-This is the top-level interface to the merge machinery
19
-which drives multiple merge strategy scripts.
18
+Merges the history specified by <commit> into HEAD, optionally using a
19
+specific merge strategy.
20
21
-The second syntax (<msg> `HEAD` <remote>) is supported for
21
+The second syntax (<msg> `HEAD` <commit>...) is supported for
22
historical reasons. Do not use it from the command line or in
23
-new scripts. It is the same as `git merge -m <msg> <remote>`.
23
+new scripts. It is the same as `git merge -m <msg> <commit>...`.
24
25
26
OPTIONS
@@ -33,10 +33,10 @@ include::merge-options.txt[]
33
used to give a good default for automated 'git merge'
34
invocations.
35
36
-<remote>...::
37
- Other branch heads to merge into our branch. You need at
38
- least one <remote>. Specifying more than one <remote>
39
- obviously means you are trying an Octopus.
36
+<commit>...::
37
+ Commits, usually other branch heads, to merge into our branch.
38
+ You need at least one <commit>. Specifying more than one
39
+ <commit> obviously means you are trying an Octopus.
40
41
include::merge-strategies.txt[]
42
@@ -96,8 +96,8 @@ file matches exactly the current `HEAD` commit; otherwise we
96
will write out your local changes already registered in your
97
index file along with the merge result, which is not good.
98
Because 1. involves only those paths differing between your
99
-branch and the remote branch you are pulling from during the
100
-merge (which is typically a fraction of the whole tree), you can
99
+branch and the branch you are merging
100
+(which is typically a fraction of the whole tree), you can
101
have local modifications in your working tree as long as they do
102
not overlap with what the merge updates.
103
@@ -110,7 +110,7 @@ When there are conflicts, the following happens:
110
111
3. For conflicting paths, the index file records up to three
112
versions; stage1 stores the version from the common ancestor,
113
- stage2 from `HEAD`, and stage3 from the remote branch (you
113
+ stage2 from `HEAD`, and stage3 from the other branch (you
114
can inspect the stages with `git ls-files -u`). The working
115
tree files contain the result of the "merge" program; i.e. 3-way
116
merge results with familiar conflict markers `<<< === >>>`.
@@ -202,15 +202,15 @@ You can work through the conflict with a number of tools:
202
mergetool which will work you through the merge.
203
204
* Look at the diffs. 'git diff' will show a three-way diff,
205
- highlighting changes from both the HEAD and remote versions.
205
+ highlighting changes from both the HEAD and their versions.
206
207
* Look at the diffs on their own. 'git log --merge -p <path>'
208
- will show diffs first for the HEAD version and then the
209
- remote version.
208
+ will show diffs first for the HEAD version and then
209
+ their version.
210
211
* Look at the originals. 'git show :1:filename' shows the
212
common ancestor, 'git show :2:filename' shows the HEAD
213
- version and 'git show :3:filename' shows the remote version.
213
+ version and 'git show :3:filename' shows their version.
214
215
216
EXAMPLES