Re: [PATCH 06/10] merge-strategies.txt: avoid giving special preference to patience algorithm
From: Eric Sunshine <hidden>
Date: 2021-08-03 17:01:41
On Tue, Aug 3, 2021 at 11:35 AM Elijah Newren via GitGitGadget [off-list ref] wrote:
quoted hunk ↗ jump to hunk
We already have diff-algorithm that explains why there are special diff algorithms, so we do not need to re-explain patience. patience exists as its own toplevel option for historical reasons, but there's no reason to give it special preference or document it again and suggest it's more important than other diff algorithms, so just refer to it as a deprecated shorthand for `diff-algorithm=patience`. Signed-off-by: Elijah Newren <redacted> ---diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt@@ -37,11 +37,7 @@ theirs;; patience;; - With this option, 'merge-recursive' spends a little extra time - to avoid mismerges that sometimes occur due to unimportant - matching lines (e.g., braces from distinct functions). Use - this when the branches to be merged have diverged wildly. - See also linkgit:git-diff[1] `--patience`. + Deprecated shorthand for diff-algorithm=patience.
Probably want to wrap backticks around `diff-algorithm=patience`. The
rest of this file seems to be pretty consistent about it. Indeed, the
existing deprecation in this file does so:
rename-threshold=<n>;;
Deprecated synonym for `find-renames=<n>`.
Maybe also s/shorthand/synonym/ for consistency with the existing
deprecation notice.