development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Documentation/git-merge: reword references to "remote" and "pull"

Browse source 
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>
This commit is contained in:
Thomas Rast 2010-01-07 17:32:19 +01:00
parent d6f8fd0b3e
commit 57bddb1153
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Documentation/git-merge.txt
View file

@ -10,17 +10,17 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]... 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
[-m <msg>] <remote>... [-m <msg>] <commit>...
'git merge' <msg> HEAD <remote>... 'git merge' <msg> HEAD <commit>...
DESCRIPTION DESCRIPTION
----------- -----------
This is the top-level interface to the merge machinery Merges the history specified by <commit> into HEAD, optionally using a
which drives multiple merge strategy scripts. specific merge strategy.
The second syntax (<msg> `HEAD` <remote>) is supported for The second syntax (<msg> `HEAD` <commit>...) is supported for
historical reasons. Do not use it from the command line or in historical reasons. Do not use it from the command line or in
new scripts. It is the same as `git merge -m <msg> <remote>`. new scripts. It is the same as `git merge -m <msg> <commit>...`.
OPTIONS OPTIONS
@ -33,10 +33,10 @@ include::merge-options.txt[]
used to give a good default for automated 'git merge' used to give a good default for automated 'git merge'
invocations. invocations.
<remote>...:: <commit>...::
Other branch heads to merge into our branch. You need at Commits, usually other branch heads, to merge into our branch.
least one <remote>. Specifying more than one <remote> You need at least one <commit>. Specifying more than one
obviously means you are trying an Octopus. <commit> obviously means you are trying an Octopus.
include::merge-strategies.txt[] include::merge-strategies.txt[]
@ -96,8 +96,8 @@ file matches exactly the current `HEAD` commit; otherwise we
will write out your local changes already registered in your will write out your local changes already registered in your
index file along with the merge result, which is not good. index file along with the merge result, which is not good.
Because 1. involves only those paths differing between your Because 1. involves only those paths differing between your
branch and the remote branch you are pulling from during the branch and the branch you are merging
merge (which is typically a fraction of the whole tree), you can (which is typically a fraction of the whole tree), you can
have local modifications in your working tree as long as they do have local modifications in your working tree as long as they do
not overlap with what the merge updates. not overlap with what the merge updates.
@ -110,7 +110,7 @@ When there are conflicts, the following happens:
3. For conflicting paths, the index file records up to three 3. For conflicting paths, the index file records up to three
versions; stage1 stores the version from the common ancestor, versions; stage1 stores the version from the common ancestor,
stage2 from `HEAD`, and stage3 from the remote branch (you stage2 from `HEAD`, and stage3 from the other branch (you
can inspect the stages with `git ls-files -u`). The working can inspect the stages with `git ls-files -u`). The working
tree files contain the result of the "merge" program; i.e. 3-way tree files contain the result of the "merge" program; i.e. 3-way
merge results with familiar conflict markers `<<< === >>>`. merge results with familiar conflict markers `<<< === >>>`.
@ -202,15 +202,15 @@ You can work through the conflict with a number of tools:
mergetool which will work you through the merge. mergetool which will work you through the merge.
* Look at the diffs. 'git diff' will show a three-way diff, * Look at the diffs. 'git diff' will show a three-way diff,
highlighting changes from both the HEAD and remote versions. highlighting changes from both the HEAD and their versions.
* Look at the diffs on their own. 'git log --merge -p <path>' * Look at the diffs on their own. 'git log --merge -p <path>'
will show diffs first for the HEAD version and then the will show diffs first for the HEAD version and then
remote version. their version.
* Look at the originals. 'git show :1:filename' shows the * Look at the originals. 'git show :1:filename' shows the
common ancestor, 'git show :2:filename' shows the HEAD common ancestor, 'git show :2:filename' shows the HEAD
version and 'git show :3:filename' shows the remote version. version and 'git show :3:filename' shows their version.
EXAMPLES EXAMPLES