X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-merge.txt;h=55bc3674797366496d7c1ca1f5b6564b06c01de1;hb=c30e699fc509f43f459c17d3148e7d866fb9157a;hp=821e21bba32db35d667fa181b5696a3a0d2f9518;hpb=f5a84c372f8f044899dde91f1a415d2bf963377e;p=git.git

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 821e21bba..55bc36747 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -9,7 +9,7 @@ git-merge - Join two or more development histories together
 SYNOPSIS
 --------
 [verse]
-'git-merge' [-n] [--summary] [--no-commit] [--squash] [-s <strategy>]...
+'git-merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
 	[-m <msg>] <remote> <remote>...
 'git-merge' <msg> HEAD <remote>...
 
@@ -168,4 +168,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