oneway_merge(): only lstat() when told to update worktree

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 47235bea0403bf25fa73529a37a7c5f87d0d7eb9..4f441311c27766da6e1dfa4b1cfe8f228842626a 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -129,11 +129,13 @@ This option is only applicable in non-verbose mode.
        use `git branch --list <pattern>` to list matching branches.
 
 -v::
+-vv::
 --verbose::
        When in list mode,
        show sha1 and commit subject line for each head, along with
        relationship to upstream branch (if any). If given twice, print
-       the name of the upstream branch, as well.
+       the name of the upstream branch, as well (see also `git remote
+       show <remote>`).
 
 -q::
 --quiet::