diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-09-01 01:39:05 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-09-01 01:39:05 +0300 |
commit | 5b6211aee1f042a6961ef8a6bd8286db51bfc513 (patch) | |
tree | 45e6790acc7705d569c35418bef0ade2c2436c22 /Documentation/config.txt | |
parent | d75bb73bcf2ecce38c147980aac0cbc27a6b838a (diff) | |
parent | 4f655e22b76fed49b0c32bcdcd899934215b9a6d (diff) |
Merge branch 'jk/notes-merge-config'
"git notes merge" can be told with "--strategy=<how>" option how to
automatically handle conflicts; this can now be configured by
setting notes.mergeStrategy configuration variable.
* jk/notes-merge-config:
notes: teach git-notes about notes.<name>.mergeStrategy option
notes: add notes.mergeStrategy option to select default strategy
notes: add tests for --commit/--abort/--strategy exclusivity
notes: extract parse_notes_merge_strategy to notes-utils
notes: extract enum notes_merge_strategy to notes-utils.h
notes: document cat_sort_uniq rewriteMode
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r-- | Documentation/config.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index f5d15fff3e..4400a1c9d8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1942,6 +1942,18 @@ 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.<name>.mergeStrategy:: + Which merge strategy to choose when doing a notes merge into + refs/notes/<name>. This overrides the more general + "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in + linkgit:git-notes[1] for more information on the available strategies. + notes.displayRef:: The (fully qualified) refname from which to show notes when showing commit messages. The value of this variable can be set @@ -1970,8 +1982,8 @@ notes.rewriteMode:: When copying notes during a rewrite (see the "notes.rewrite.<command>" option), determines what to do if the target commit already has a note. Must be one of - `overwrite`, `concatenate`, or `ignore`. Defaults to - `concatenate`. + `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. + Defaults to `concatenate`. + This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable. |