summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Luke Diamand <luke@diamand.org>2012-04-24 09:33:23 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-24 14:22:23 -0700
commit6a10b6aa1e7b9bb114e525edb67b7650b46f333e (patch)
treede42e5eae3f54afac793510fbf7ae3030a7c727d /Documentation
parentgit p4: Ignore P4EDITOR if it is empty (diff)
downloadtgif-6a10b6aa1e7b9bb114e525edb67b7650b46f333e.tar.xz
git p4: move verbose to base class
The verbose flag is common to all classes, or at least should be. Make it a member of the base Command class, rather than reimplementing for each class. Make option parsing mirror this. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-p4.txt11
1 files changed, 4 insertions, 7 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 01cc97bb11..51955a5f7c 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -158,11 +158,14 @@ OPTIONS
General options
~~~~~~~~~~~~~~~
-All commands except clone accept this option.
+All commands except clone accept these options.
--git-dir <dir>::
Set the 'GIT_DIR' environment variable. See linkgit:git[1].
+--verbose::
+ Provide more progress information.
+
Sync options
~~~~~~~~~~~~
These options can be used in the initial 'clone' as well as in
@@ -193,9 +196,6 @@ git repository:
--silent::
Do not print any progress information.
---verbose::
- Provide more progress information.
-
--detect-labels::
Query p4 for labels associated with the depot paths, and add
them as tags in git. Limited usefulness as only imports labels
@@ -249,9 +249,6 @@ Submit options
~~~~~~~~~~~~~~
These options can be used to modify 'git p4 submit' behavior.
---verbose::
- Provide more progress information.
-
--origin <commit>::
Upstream location from which commits are identified to submit to
p4. By default, this is the most recent p4 commit reachable