summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorLuke Diamand <luke@diamand.org>2015-01-23 09:15:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-23 22:44:14 (GMT)
commit10de86d0d57dfa6680e229bfa0aa8ed31382767e (patch)
treea12933d3aedf172e53f313aa3c9fa70d026ce90a /git-p4.py
parentfdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff)
downloadgit-10de86d0d57dfa6680e229bfa0aa8ed31382767e.zip
git-10de86d0d57dfa6680e229bfa0aa8ed31382767e.tar.gz
git-10de86d0d57dfa6680e229bfa0aa8ed31382767e.tar.bz2
git-p4: correct --prepare-p4-only instructions
If you use git-p4 with the "--prepare-p4-only" option, then it prints the p4 command line to use. However, the command line was incorrect: the changelist specification must be supplied on standard input, not as an argument to p4. Signed-off-by: Luke Diamand <luke@diamand.org> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index ff132b2..90447de 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1442,7 +1442,7 @@ class P4Submit(Command, P4UserMap):
print " " + self.clientPath
print
print "To submit, use \"p4 submit\" to write a new description,"
- print "or \"p4 submit -i %s\" to use the one prepared by" \
+ print "or \"p4 submit -i <%s\" to use the one prepared by" \
" \"git p4\"." % fileName
print "You can delete the file \"%s\" when finished." % fileName