From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jul 2019 19:38:16 +0000 (-0700)
Subject: Merge branch 'po/doc-branch' into maint
X-Git-Tag: v2.23.0-rc0~1^2~21
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=0c47e8ddf5e6584fe8baf8d25b2bcc4ca4c9cb5d

Merge branch 'po/doc-branch' into maint

Doc update.

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

0c47e8ddf5e6584fe8baf8d25b2bcc4ca4c9cb5d
diff --cc Documentation/git-branch.txt
index 6ebd512b4f,c57f6a15c6..d9325e2145
--- a/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>]]