summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorTay Ray Chuan <rctay89@gmail.com>2010-02-24 12:50:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-24 16:35:43 (GMT)
commit409b8d82dfc216ce5e89c81fdc2431dbf897c2d7 (patch)
treecdb4ecb75b6be487d1979a605ba3c336cc2950cc /Documentation/merge-options.txt
parentc54b74afb78e385d645447711da2201ad45151fa (diff)
downloadgit-409b8d82dfc216ce5e89c81fdc2431dbf897c2d7.zip
git-409b8d82dfc216ce5e89c81fdc2431dbf897c2d7.tar.gz
git-409b8d82dfc216ce5e89c81fdc2431dbf897c2d7.tar.bz2
Documentation/git-pull: put verbosity options before merge/fetch ones
After 3f7a9b5 (Documentation/git-pull.txt: Add subtitles above included option files, Thu Oct 22 2009), the -q/-v options were mentioned only for the merge options section, giving the impression that git-fetch did not take those arguments. Follow 90e4311 (git-pull: do not mention --quiet and --verbose twice, Mon Sep 7 2009) and hide -q/-v for merge options, while mentioning -q/-v before the merge- and fetch-specific options. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 3b83dba..37ce9a1 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -67,6 +67,7 @@ option can be used to override --squash.
Synonyms to --stat and --no-stat; these are deprecated and will be
removed in the future.
+ifndef::git-pull[]
-q::
--quiet::
Operate quietly.
@@ -74,6 +75,7 @@ option can be used to override --squash.
-v::
--verbose::
Be verbose.
+endif::git-pull[]
-X <option>::
--strategy-option=<option>::