From: Sergey Organov <sorga...@gmail.com> Get rid of outdated explicit list of options.
Reflect that the obsolete form: 'git merge' <msg> HEAD <commit>... could also have options. Signed-off-by: Sergey Organov <sorga...@gmail.com> --- Documentation/git-merge.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 1f94908..1de61a4 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -9,10 +9,8 @@ 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[<key-id>]] - [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...] -'git merge' <msg> HEAD <commit>... +'git merge' [options] [-m <msg>] [<commit>...] +'git merge' [options] <msg> HEAD <commit>... 'git merge' --abort DESCRIPTION -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
