diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-31 15:39:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-31 15:39:05 -0700 |
| commit | 5b6211aee1f042a6961ef8a6bd8286db51bfc513 (patch) | |
| tree | 45e6790acc7705d569c35418bef0ade2c2436c22 /ll-merge.c | |
| parent | d75bb73bcf2ecce38c147980aac0cbc27a6b838a (diff) | |
| parent | 4f655e22b76fed49b0c32bcdcd899934215b9a6d (diff) | |
| download | git-5b6211aee1f042a6961ef8a6bd8286db51bfc513.tar.gz | |
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 'll-merge.c')
0 files changed, 0 insertions, 0 deletions