summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2008-06-08 01:36:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-06-08 20:46:38 (GMT)
commit3240240ff427fa2e26a847c7c9fd89e6a4313daa (patch)
treea1e21579aca42b7e4d8d718050bc522961530cfa /Documentation/merge-options.txt
parentbc47c29ec18164ba1f05600333457cf6f2432856 (diff)
downloadgit-3240240ff427fa2e26a847c7c9fd89e6a4313daa.zip
git-3240240ff427fa2e26a847c7c9fd89e6a4313daa.tar.gz
git-3240240ff427fa2e26a847c7c9fd89e6a4313daa.tar.bz2
Docs: Use "-l::\n--long\n" format in OPTIONS sections
The OPTIONS section of a documentation file contains a list of the options a git command accepts. Currently there are several variants to describe the case that different options (almost) do the same in the OPTIONS section. Some are: -f, --foo:: -f|--foo:: -f | --foo:: But AsciiDoc has the special form: -f:: --foo:: This patch applies this form to the documentation of the whole git suite, and removes useless em-dash prevention, so \--foo becomes --foo. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index f37a776..ffbc6e9 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -2,10 +2,12 @@
Show a diffstat at the end of the merge. The diffstat is also
controlled by the configuration option merge.stat.
--n, \--no-stat::
+-n::
+--no-stat::
Do not show diffstat at the end of the merge.
---summary, \--no-summary::
+--summary::
+--no-summary::
Synonyms to --stat and --no-stat; these are deprecated and will be
removed in the future.
@@ -49,7 +51,8 @@
a fast-forward, only update the branch pointer. This is
the default behavior of git-merge.
--s <strategy>, \--strategy=<strategy>::
+-s <strategy>::
+--strategy=<strategy>::
Use the given merge strategy; can be supplied more than
once to specify them in the order they should be tried.
If there is no `-s` option, a built-in list of strategies