Merge branch 'jk/branch-l-0-deprecation' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Mar 2018 01:27:25 +0000 (18:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Mar 2018 01:27:25 +0000 (18:27 -0700)
The "-l" option in "git branch -l" is an unfortunate short-hand for
"--create-reflog", but many users, both old and new, somehow expect
it to be something else, perhaps "--list". This step deprecates
the short-hand and warns about the future removal of the it when it
is used.

* jk/branch-l-0-deprecation:
branch: deprecate "-l" option
t: switch "branch -l" to "branch --create-reflog"
t3200: unset core.logallrefupdates when testing reflog creation

1  2 
builtin/branch.c
Simple merge