diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
| commit | 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch) | |
| tree | 4a681cad5c6da23a7d7f56022666fb31397026d2 /git-notes.html | |
| parent | 359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff) | |
| download | git-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz | |
Autogenerated HTML docs for v2.42.0-482-g2e8e7
Diffstat (limited to 'git-notes.html')
| -rw-r--r-- | git-notes.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-notes.html b/git-notes.html index be22522ba..849ec4c76 100644 --- a/git-notes.html +++ b/git-notes.html @@ -1246,7 +1246,7 @@ notes.mergeStrategy <p>
Which merge strategy to choose by default when resolving notes
conflicts. Must be one of <code>manual</code>, <code>ours</code>, <code>theirs</code>, <code>union</code>, or
- <code>cat_sort_uniq</code>. Defaults to <code>manual</code>. See "NOTES MERGE STRATEGIES"
+ <code>cat_sort_uniq</code>. Defaults to <code>manual</code>. See the "NOTES MERGE STRATEGIES"
section of <a href="git-notes.html">git-notes(1)</a> for more information on each strategy.
</p>
<div class="paragraph"><p>This setting can be overridden by passing the <code>--strategy</code> option to
|