Merge branch 'tb/cygwin-shared-repository'

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 2635dee413f02f39e81e439950f958f941640931..b7cb625b894d4ba83cb13914e1fd010e1bfaf0d3 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -47,7 +47,7 @@ Note that this will create the new branch, but it will not switch the
 working tree to it; use "git checkout <newbranch>" to switch to the
 new branch.
 
-When a local branch is started off a remote-tracking branch, git sets up the
+When a local branch is started off a remote-tracking branch, Git sets up the
 branch so that 'git pull' will appropriately merge from
 the remote-tracking branch. This behavior may be changed via the global
 `branch.autosetupmerge` configuration flag. That setting can be
@@ -195,15 +195,15 @@ start-point is either a local or remote-tracking branch.
 
 --contains [<commit>]::
        Only list branches which contain the specified commit (HEAD
-       if not specified).
+       if not specified). Implies `--list`.
 
 --merged [<commit>]::
        Only list branches whose tips are reachable from the
-       specified commit (HEAD if not specified).
+       specified commit (HEAD if not specified). Implies `--list`.
 
 --no-merged [<commit>]::
        Only list branches whose tips are not reachable from the
-       specified commit (HEAD if not specified).
+       specified commit (HEAD if not specified). Implies `--list`.
 
 <branchname>::
        The name of the branch to create or delete.