Merge branch 'jk/branch-l-1-repurpose'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:50 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:50 +0000 (13:53 -0700)
Updated plan to repurpose the "-l" option to "git branch".

* jk/branch-l-1-repurpose:
doc/git-branch: remove obsolete "-l" references
branch: make "-l" a synonym for "--list"

1  2 
Documentation/git-branch.txt
builtin/branch.c
Simple merge
Simple merge