summaryrefslogtreecommitdiff
path: root/t/t4108-apply-threeway.sh
diff options
context:
space:
mode:
authorLibravatar Jacob Keller <jacob.keller@gmail.com>2015-08-17 14:33:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-17 15:39:13 -0700
commit4f655e22b76fed49b0c32bcdcd899934215b9a6d (patch)
treee48e1263e1150c5c24d21c6cba74e9c2048bd162 /t/t4108-apply-threeway.sh
parentnotes: add notes.mergeStrategy option to select default strategy (diff)
downloadtgif-4f655e22b76fed49b0c32bcdcd899934215b9a6d.tar.xz
notes: teach git-notes about notes.<name>.mergeStrategy option
Teach notes about a new "notes.<name>.mergeStrategy" option for configuring the notes merge strategy when merging into refs/notes/<name>. This option allows for the selection of merge strategy for particular notes refs, rather than all notes ref merges, as user may not want cat_sort_uniq for all refs, but only some. Note that the <name> is the local reference we are merging into, not the remote ref we merged from. The assumption is that users will mostly want to configure separate local ref merge strategies rather than strategies depending on which remote ref they merge from. notes.<name>.mergeStrategy overrides the general behavior as it is more specific. Signed-off-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4108-apply-threeway.sh')
0 files changed, 0 insertions, 0 deletions