Merge git://repo.or.cz/git-gui

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index b7285bcdbc80a2aa574fa13050c00f1ce9975419..5ce905de862253aa2bd2ed619819306165e978f0 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -85,7 +85,7 @@ OPTIONS
 -a::
        List both remote-tracking branches and local branches.
 
--v::
+-v, --verbose::
        Show sha1 and commit subject line for each head.
 
 --abbrev=<length>::
@@ -105,7 +105,7 @@ OPTIONS
        '--track' were given.
 
 --no-track::
-       When -b is given and a branch is created off a remote branch,
+       When a branch is created off a remote branch,
        set up configuration so that git-pull will not retrieve data
        from the remote branch, ignoring the branch.autosetupmerge
        configuration variable.