diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-12-08 14:04:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-08 14:04:33 -0800 |
| commit | 9688a882e12a80bc94d6e34d5a4b34816990e9eb (patch) | |
| tree | 398cd1730afa1cb807d4b1dbcd68803724d37cdf | |
| parent | Make sure we use compat/subprocess.py with Python 2.3 while running tests. (diff) | |
| download | tgif-9688a882e12a80bc94d6e34d5a4b34816990e9eb.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-fetch.txt | 2 | ||||
| -rw-r--r-- | Documentation/merge-options.txt | 2 | ||||
| -rw-r--r-- | Documentation/merge-strategies.txt | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 438240c0cf..d1b45f96ed 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -18,7 +18,7 @@ the objects necessary to complete them. The ref names and their object names of fetched refs are stored 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 diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index eebaf3aaff..53cc35590d 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -11,6 +11,6 @@ Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. 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). diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 3ec56d22eb..7df0266ba8 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -6,27 +6,27 @@ resolve:: and another branch you pulled from) using 3-way merge algorithm. It tries to carefully detect criss-cross merge ambiguities and is considered generally safe and - fast. This is the default merge strategy when pulling - one branch. + fast. recursive:: This can only resolve two heads using 3-way merge algorithm. When there are more than one common 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 reported to result in fewer merge conflicts without causing mis-merges by tests done on actual merge commits taken from Linux 2.6 kernel development history. Additionally this can detect and handle merges involving - renames. + renames. This is the default merge strategy when + pulling or merging one branch. octopus:: This resolves more than two-head case, but refuses to do complex merge that needs manual resolution. It is primarily meant to be used for bundling topic branch heads together. This is the default merge strategy when - pulling more than one branch. + pulling or merging more than one branches. ours:: This resolves any number of heads, but the result of the |