Merge branch 'maint'
commitdcc30eb2c780f009af36f87d6c4ff484eeec5bec
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Apr 2010 06:27:23 +0000 (8 23:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Apr 2010 06:27:23 +0000 (8 23:27 -0700)
treefef744202f8e074a2fd469ae867de1730f69a05b
parent02125bcc41aed022ddcb5955935726e50d89b60e
parent4c35f0dbc41a2bb79e4f597d3b7bdb265c5ea750
Merge branch 'maint'

* maint:
  docs: clarify "branch -l"
Documentation/git-branch.txt