Merge branch 'po/doc-branch' into maint

Doc update.

* po/doc-branch:
doc branch: provide examples for listing remote tracking branches

diff --cc Documentation/git-branch.txt
index 6ebd512b4f3344c2f166f5bb09f0b5c6eb96ab03,c57f6a15c6cbea10b842172370be4456fbd09b5d..d9325e2145441520c706c8d0a369d559e841eb19
--- 1/Documentation/git-branch.txt
--- 2/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@@ -8,8 -8,8 +8,9 @@@ git-branch - List, create, or delete br
  SYNOPSIS
  --------
  [verse]
- 'git branch' [--color[=<when>] | --no-color] [-r | -a]
-       [--list] [--show-current] [-v [--abbrev=<length> | --no-abbrev]]
+ 'git branch' [--color[=<when>] | --no-color]
+       [-v [--abbrev=<length> | --no-abbrev]]
++      [--show-current]
        [--column[=<options>] | --no-column] [--sort=<key>]
        [(--merged | --no-merged) [<commit>]]
        [--contains [<commit]] [--no-contains [<commit>]]

diff --cc builtin/branch.c
Simple merge