Documentation: recursive is the default strategy these days.
We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Dec 8, 2005 at 14:04 UTC
9688a882e12a80bc94d6e34d5a4b34816990e9eb
3 files changed
+7
-7
Documentation/git-fetch.txt
+1
-1
@@ -18,7 +18,7 @@ the objects necessary to complete them.
18
19
The ref names and their object names of fetched refs are stored
20
in `.git/FETCH_HEAD`. This information is left for a later merge
21
-operation done by "git resolve" or "git octopus".
21
+operation done by "git merge".
22
23
24
OPTIONS
Documentation/merge-options.txt
+1
-1
@@ -11,6 +11,6 @@
11
Use the given merge strategy; can be supplied more than
12
once to specify them in the order they should be tried.
13
If there is no `-s` option, a built-in list of strategies
14
- is used instead (`git-merge-resolve` when merging a single
14
+ is used instead (`git-merge-recursive` when merging a single
15
head, `git-merge-octopus` otherwise).
16
Documentation/merge-strategies.txt
+5
-5
@@ -6,27 +6,27 @@ resolve::
6
and another branch you pulled from) using 3-way merge
7
algorithm. It tries to carefully detect criss-cross
8
merge ambiguities and is considered generally safe and
9
- fast. This is the default merge strategy when pulling
10
- one branch.
9
+ fast.
10
11
recursive::
12
This can only resolve two heads using 3-way merge
13
algorithm. When there are more than one common
14
ancestors that can be used for 3-way merge, it creates a
16
- merged tree of the common ancestores and uses that as
15
+ merged tree of the common ancestors and uses that as
16
the reference tree for the 3-way merge. This has been
17
reported to result in fewer merge conflicts without
18
causing mis-merges by tests done on actual merge commits
19
taken from Linux 2.6 kernel development history.
20
Additionally this can detect and handle merges involving
22
- renames.
21
+ renames. This is the default merge strategy when
22
+ pulling or merging one branch.
23
24
octopus::
25
This resolves more than two-head case, but refuses to do
26
complex merge that needs manual resolution. It is
27
primarily meant to be used for bundling topic branch
28
heads together. This is the default merge strategy when
29
- pulling more than one branch.
29
+ pulling or merging more than one branches.
30
31
ours::
32
This resolves any number of heads, but the result of the