From: sorganov@gmail.com
To: git@vger.kernel.org
Cc: gitster@pobox.com, Sergey Organov <sorganov@gmail.com>
Subject: [PATCH] Documentation/git-merge.txt: improve SYNOPSIS
Date: Tue, 21 Apr 2015 14:08:08 +0300 [thread overview]
Message-ID: <1429614488-20731-1-git-send-email-sorganov@gmail.com> (raw)
From: Sergey Organov <sorganov@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 <sorganov@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
reply other threads:[~2015-04-21 11:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1429614488-20731-1-git-send-email-sorganov@gmail.com \
--to=sorganov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).