summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2014-01-21 23:16:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-22 16:06:20 (GMT)
commitf84cb684634f50df7adde7f52c25f049d257f0e3 (patch)
treecc0169dbbf691963cfdcf9d333ac434793228aab
parent3d5388afa856fde3efff023f5b672005834e7ca1 (diff)
downloadgit-f84cb684634f50df7adde7f52c25f049d257f0e3.zip
git-f84cb684634f50df7adde7f52c25f049d257f0e3.tar.gz
git-f84cb684634f50df7adde7f52c25f049d257f0e3.tar.bz2
git p4 doc: use two-line style for options with multiple spellings
Thomas Rast noticed the docs have a mix of styles when it comes to options with multiple spellings. Standardize the couple in git-p4.txt that are odd. Instead of: -n, --dry-run:: Do this: -n:: --dry-run:: See http://thread.gmane.org/gmane.comp.version-control.git/219936/focus=219945 Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-p4.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 8cba16d..6ab5f94 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -168,7 +168,8 @@ All commands except clone accept these options.
--git-dir <dir>::
Set the 'GIT_DIR' environment variable. See linkgit:git[1].
---verbose, -v::
+-v::
+--verbose::
Provide more progress information.
Sync options
@@ -279,7 +280,8 @@ These options can be used to modify 'git p4 submit' behavior.
Export tags from Git as p4 labels. Tags found in Git are applied
to the perforce working directory.
---dry-run, -n::
+-n::
+--dry-run::
Show just what commits would be submitted to p4; do not change
state in Git or p4.