diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-03-29 16:39:07 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-29 16:39:07 +0900 |
| commit | eb7923be1ff0a81e9ce5849f6a6202a4d9e9d0f2 (patch) | |
| tree | 8e047980a95ba3bd635db1ea0b48ca9351c225c0 /Documentation | |
| parent | Merge branch 'ps/refname-avail-check-optim' (diff) | |
| parent | am: switch from merge_recursive_generic() to merge_ort_generic() (diff) | |
| download | git-eb7923be1ff0a81e9ce5849f6a6202a4d9e9d0f2.tar.gz git-eb7923be1ff0a81e9ce5849f6a6202a4d9e9d0f2.zip | |
Merge branch 'en/merge-ort-prepare-to-remove-recursive'
First step of deprecating and removing merge-recursive.
* en/merge-ort-prepare-to-remove-recursive:
am: switch from merge_recursive_generic() to merge_ort_generic()
merge-ort: fix merge.directoryRenames=false
t3650: document bug when directory renames are turned off
merge-ort: support having merge verbosity be set to 0
merge-ort: allow rename detection to be disabled
merge-ort: add new merge_ort_generic() function
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-strategies.adoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/merge-strategies.adoc b/Documentation/merge-strategies.adoc index 93822ebc4e..59f5ae36cc 100644 --- a/Documentation/merge-strategies.adoc +++ b/Documentation/merge-strategies.adoc @@ -82,6 +82,11 @@ find-renames[=<n>];; rename-threshold=<n>;; Deprecated synonym for `find-renames=<n>`. +no-renames;; + Turn off rename detection. This overrides the `merge.renames` + configuration variable. + See also linkgit:git-diff[1] `--no-renames`. + subtree[=<path>];; This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be shifted to @@ -107,7 +112,7 @@ For a path that is a submodule, the same caution as 'ort' applies to this strategy. + The 'recursive' strategy takes the same options as 'ort'. However, -there are three additional options that 'ort' ignores (not documented +there are two additional options that 'ort' ignores (not documented above) that are potentially useful with the 'recursive' strategy: patience;; @@ -121,11 +126,6 @@ diff-algorithm=[patience|minimal|histogram|myers];; specifically uses `diff-algorithm=histogram`, while `recursive` defaults to the `diff.algorithm` config setting. -no-renames;; - Turn off rename detection. This overrides the `merge.renames` - configuration variable. - See also linkgit:git-diff[1] `--no-renames`. - resolve:: This can only resolve two heads (i.e. the current branch and another branch you pulled from) using a 3-way merge |