git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 11/11] git p4 doc: use two-line style for options with multiple spellings

From
PWPete Wyckoff <pw@padd.com>
Date
Jan 21, 2014, 23:16 UTC
Message-ID
<1390346208-9207-12-git-send-email-pw@padd.com>
In-Reply-To
<1390346208-9207-1-git-send-email-pw@padd.com>

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>
---
 Documentation/git-p4.txt | 6 ++++--
 1 file 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.
 
-- 
1.8.5.2.320.g99957e5
Previous: Pete WyckoffNext: Junio C Hamano
Message 14 of 27 in “git p4 tests and a few bug fixes”
  1. 00/11 git p4 tests and a few bug fixesPete Wyckoff, Jan 21, 2014
  2. 01/11 git p4 test: wildcards are supportedPete Wyckoff, Jan 21, 2014
  3. 02/11 git p4 test: ensure p4 symlink parsing worksPete Wyckoff, Jan 21, 2014
  4. 03/11 git p4: work around p4 bug that causes empty symlinksPete Wyckoff, Jan 21, 2014
  5. Eric SunshineJan 22, 2014
  6. 04/11 git p4 test: explicitly check p4 wildcard deletePete Wyckoff, Jan 21, 2014
  7. 05/11 git p4 test: is_cli_file_writeable succeedsPete Wyckoff, Jan 21, 2014
  8. 06/11 git p4 test: run as user "author"Pete Wyckoff, Jan 21, 2014
  9. Eric SunshineJan 22, 2014
  10. 07/11 git p4 test: do not pollute /tmpPete Wyckoff, Jan 21, 2014
  11. 08/11 git p4: handle files with wildcards when doing RCS scrubbingPete Wyckoff, Jan 21, 2014
  12. 09/11 git p4: fix an error message when "p4 where" failsPete Wyckoff, Jan 21, 2014
  13. 10/11 git p4 test: examine behavior with locked (+l) filesPete Wyckoff, Jan 21, 2014
  14. 11/11 git p4 doc: use two-line style for options with multiple spellingsPete Wyckoff, Jan 21, 2014
  15. Junio C HamanoJan 22, 2014
  16. Pete WyckoffJan 22, 2014
  17. 01/11 git p4 test: wildcards are supportedPete Wyckoff, Jan 22, 2014
  18. 02/11 git p4 test: ensure p4 symlink parsing worksPete Wyckoff, Jan 22, 2014
  19. 03/11 git p4: work around p4 bug that causes empty symlinksPete Wyckoff, Jan 22, 2014
  20. 04/11 git p4 test: explicitly check p4 wildcard deletePete Wyckoff, Jan 22, 2014
  21. 05/11 git p4 test: is_cli_file_writeable succeedsPete Wyckoff, Jan 22, 2014
  22. 06/11 git p4 test: run as user "author"Pete Wyckoff, Jan 22, 2014
  23. 07/11 git p4 test: do not pollute /tmpPete Wyckoff, Jan 22, 2014
  24. 08/11 git p4: handle files with wildcards when doing RCS scrubbingPete Wyckoff, Jan 22, 2014
  25. 09/11 git p4: fix an error message when "p4 where" failsPete Wyckoff, Jan 22, 2014
  26. 10/11 git p4 test: examine behavior with locked (+l) filesPete Wyckoff, Jan 22, 2014
  27. 11/11 git p4 doc: use two-line style for options with multiple spellingsPete Wyckoff, Jan 22, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.