summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-02-03 11:25:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-02-03 11:25:19 -0800
commitfafca0f72a11bc03263e6f97d07d6f27ea61de48 (patch)
tree0498cf6b916a833d71ac540c4eec85212ee6ac94 /mergetools
parentMerge branch 'pl/complete-diff-submodule-diff' (diff)
parentdoc: add note about ignoring '--no-create-reflog' (diff)
downloadtgif-fafca0f72a11bc03263e6f97d07d6f27ea61de48.tar.xz
Merge branch 'cw/log-updates-for-all-refs-really'
The "core.logAllRefUpdates" that used to be boolean has been enhanced to take 'always' as well, to record ref updates to refs other than the ones that are expected to be updated (i.e. branches, remote-tracking branches and notes). * cw/log-updates-for-all-refs-really: doc: add note about ignoring '--no-create-reflog' update-ref: add test cases for bare repository refs: add option core.logAllRefUpdates = always config: add markup to core.logAllRefUpdates doc
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions