From: sorganov@gmail.com Date: Wed, 05 Oct 2016 14:46:20 GMT Subject: [PATCH 2/6] Documentation/git-merge.txt: remove list of options from SYNOPSIS Message-ID: In-Reply-To: From: Sergey Organov This partial list of option is confusing as it lacks a lot of available options. It also clutters the SYNOPSIS making differences between forms of invocation less clear. Signed-off-by: Sergey Organov --- Documentation/git-merge.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index b758d55..90342eb 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -9,10 +9,7 @@ git-merge - Join two or more development histories together SYNOPSIS -------- [verse] -'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] - [-s ] [-X ] [-S[]] - [--[no-]allow-unrelated-histories] - [--[no-]rerere-autoupdate] [-m ] [...] +'git merge' [options] [-m ] [...] 'git merge' HEAD ... 'git merge' --abort -- 2.10.0.1.g57b01a3