Junio C Hamano <gits...@pobox.com> writes: > sorga...@gmail.com writes: > >> From: Sergey Organov <sorga...@gmail.com> >> >> 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 <sorga...@gmail.com> >> --- >> 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 <strategy>] [-X <strategy-option>] [-S[<keyid>]] >> - [--[no-]allow-unrelated-histories] >> - [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...] >> +'git merge' [options] [-m <msg>] [<commit>...] >> 'git merge' <msg> HEAD <commit>... >> 'git merge' --abort > > Same comment as 1/6; as we'd hopefully be removing the deprecated > form soonish, it would probably make sense to leave only two, i.e. > > git merge [options] [<commit>...] > git merge --abort > > in synposis.
Same "yes" as in 1/6, obviously. -- Sergey
