summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-27 18:45:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-27 18:45:41 (GMT)
commit523f0a25b91c34ec817bc5757f52f365f497e3bb (patch)
tree09d5b98d64030b0e7f97c2e5536b466adcfa4c32 /Documentation
parent33d4669aaa658f3e35f88748ed2db51c84203f62 (diff)
parentf84cb684634f50df7adde7f52c25f049d257f0e3 (diff)
downloadgit-523f0a25b91c34ec817bc5757f52f365f497e3bb.zip
git-523f0a25b91c34ec817bc5757f52f365f497e3bb.tar.gz
git-523f0a25b91c34ec817bc5757f52f365f497e3bb.tar.bz2
Merge branch 'pw/git-p4'
Various "git p4" updates. * pw/git-p4: git p4 doc: use two-line style for options with multiple spellings git p4 test: examine behavior with locked (+l) files git p4: fix an error message when "p4 where" fails git p4: handle files with wildcards when doing RCS scrubbing git p4 test: do not pollute /tmp git p4 test: run as user "author" git p4 test: is_cli_file_writeable succeeds git p4 test: explicitly check p4 wildcard delete git p4: work around p4 bug that causes empty symlinks git p4 test: ensure p4 symlink parsing works git p4 test: wildcards are supported
Diffstat (limited to 'Documentation')
-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.