From: jidanni@jidanni.org Date: Thu, 01 Jan 2009 18:41:08 GMT Subject: [PATCH] Documentation/git-merge: at least one not two Message-ID: <87d4f6vph7.fsf@jidanni.org> Make SYNOPSIS match usage message Signed-off-by: jidanni --- Documentation/git-merge.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index f7be584..a3ac828 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s ]... - [-m ] ... + [-m ] ... 'git merge' HEAD ... DESCRIPTION -- 1.6.0.6