rebase-i: keep old parents when preserving merges

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index c824d887420754f98db0553a006865d31d01cf1d..0fd58083eb2afdb7fed7ebf01bab3b5e1cae1421 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -95,7 +95,8 @@ OPTIONS
 -a::
        List both remote-tracking branches and local branches.
 
--v, --verbose::
+-v::
+--verbose::
        Show sha1 and commit subject line for each head.
 
 --abbrev=<length>::
@@ -209,4 +210,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite