]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/notes.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 11dd2b2) | patch
notes: add notes.mergeStrategy option to select default strategy
authorJacob Keller <jacob.keller@gmail.com>
Mon, 17 Aug 2015 21:33:33 +0000 (14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Aug 2015 22:38:54 +0000 (15:38 -0700)
commitd2d68d9975da4a15dfca0e6e59001948e5bf57f9
treef72d519b0d953932d25a8095a504e814d2ffc871tree | snapshot
parent11dd2b2e9a3303bd1e32fd2ee95ec5dff38d9d47commit | diff
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>
Documentation/config.txt diff | blob | blame | history
Documentation/git-notes.txt diff | blob | blame | history
builtin/notes.c diff | blob | blame | history
t/t3309-notes-merge-auto-resolve.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.