Merge branch 'maint'

* maint:
  Documentation: fix graph in git-rev-parse.txt
  show-branch --current: do not barf on detached HEAD

diff --cc Documentation/git-rev-parse.txt
Simple merge

diff --cc builtin-show-branch.c
Simple merge