undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: recursive is the default strategy these days.

Browse Source 
We still said resolve was the default in handful places.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-12-08 14:04:33 -08:00
parent 49ccb0877f
commit 9688a882e1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-fetch.txt
View File

@ -18,7 +18,7 @@ the objects necessary to complete them.
The ref names and their object names of fetched refs are stored The ref names and their object names of fetched refs are stored
in `.git/FETCH_HEAD`. This information is left for a later merge in `.git/FETCH_HEAD`. This information is left for a later merge
operation done by "git resolve" or "git octopus". operation done by "git merge".
OPTIONS OPTIONS

2
Documentation/merge-options.txt
View File

@ -11,6 +11,6 @@
Use the given merge strategy; can be supplied more than Use the given merge strategy; can be supplied more than
once to specify them in the order they should be tried. once to specify them in the order they should be tried.
If there is no `-s` option, a built-in list of strategies If there is no `-s` option, a built-in list of strategies
is used instead (`git-merge-resolve` when merging a single is used instead (`git-merge-recursive` when merging a single
head, `git-merge-octopus` otherwise). head, `git-merge-octopus` otherwise).

10
Documentation/merge-strategies.txt
View File

@ -6,27 +6,27 @@ resolve::
and another branch you pulled from) using 3-way merge and another branch you pulled from) using 3-way merge
algorithm. It tries to carefully detect criss-cross algorithm. It tries to carefully detect criss-cross
merge ambiguities and is considered generally safe and merge ambiguities and is considered generally safe and
fast. This is the default merge strategy when pulling fast.
one branch.
recursive:: recursive::
This can only resolve two heads using 3-way merge This can only resolve two heads using 3-way merge
algorithm. When there are more than one common algorithm. When there are more than one common
ancestors that can be used for 3-way merge, it creates a ancestors that can be used for 3-way merge, it creates a
merged tree of the common ancestores and uses that as merged tree of the common ancestors and uses that as
the reference tree for the 3-way merge. This has been the reference tree for the 3-way merge. This has been
reported to result in fewer merge conflicts without reported to result in fewer merge conflicts without
causing mis-merges by tests done on actual merge commits causing mis-merges by tests done on actual merge commits
taken from Linux 2.6 kernel development history. taken from Linux 2.6 kernel development history.
Additionally this can detect and handle merges involving Additionally this can detect and handle merges involving
renames. renames. This is the default merge strategy when
pulling or merging one branch.
octopus:: octopus::
This resolves more than two-head case, but refuses to do This resolves more than two-head case, but refuses to do
complex merge that needs manual resolution. It is complex merge that needs manual resolution. It is
primarily meant to be used for bundling topic branch primarily meant to be used for bundling topic branch
heads together. This is the default merge strategy when heads together. This is the default merge strategy when
pulling more than one branch. pulling or merging more than one branches.
ours:: ours::
This resolves any number of heads, but the result of the This resolves any number of heads, but the result of the