Merge branch 'sv/objfixes'
[gitweb.git] / Documentation / git-merge.txt
index 9c08efa53abc2797a7b7ca0e589d83b9a4387987..912ef29efce71d944af59588c6493591efc96bfc 100644 (file)
@@ -9,7 +9,7 @@ git-merge - Join two or more development histories together
 SYNOPSIS
 --------
 [verse]
-'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]...
+'git-merge' [-n] [--summary] [--no-commit] [--squash] [-s <strategy>]...
        [-m <msg>] <remote> <remote>...
 
 DESCRIPTION