diff options
| author | Jacob Keller <jacob.keller@gmail.com> | 2015-08-17 14:33:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-17 15:38:54 -0700 |
| commit | d2d68d9975da4a15dfca0e6e59001948e5bf57f9 (patch) | |
| tree | f72d519b0d953932d25a8095a504e814d2ffc871 /Documentation/config.txt | |
| parent | 11dd2b2e9a3303bd1e32fd2ee95ec5dff38d9d47 (diff) | |
| download | git-d2d68d9975da4a15dfca0e6e59001948e5bf57f9.tar.gz | |
notes: add notes.mergeStrategy option to select default strategy
Teach git-notes about "notes.mergeStrategy" to select a general strategy
for all notes merges. This enables a user to always get expected merge
strategy such as "cat_sort_uniq" without having to pass the "-s" option
manually.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 9a6140b81c..8a3dc2cfcd 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1886,6 +1886,12 @@ mergetool.writeToTemp:: mergetool.prompt:: Prompt before each invocation of the merge resolution program. +notes.mergeStrategy:: + Which merge strategy to choose by default when resolving notes + conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or + `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES" + section of linkgit:git-notes[1] for more information on each strategy. + notes.displayRef:: The (fully qualified) refname from which to show notes when showing commit messages. The value of this variable can be set |