Merge branch 'cw/log-updates-for-all-refs-really'
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Feb 2017 19:25:19 +0000 (11:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Feb 2017 19:25:19 +0000 (11:25 -0800)
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

1  2 
Documentation/config.txt
Documentation/git-tag.txt
builtin/checkout.c
cache.h
refs/files-backend.c
t/t7004-tag.sh
Simple merge
Simple merge
Simple merge
diff --cc cache.h
Simple merge
Simple merge
diff --cc t/t7004-tag.sh
Simple merge