From: Ben Keene <seraphire@xxxxxxxxx>
Signed-off-by: Ben Keene <seraphire@xxxxxxxxx>
---
Documentation/git-p4.txt | 2 +-
git-p4.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index e206e69250..21ef100c28 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -547,7 +547,7 @@ git-p4.retries::
Set the value to 0 to disable retries or if your p4 version
does not support retries (pre 2012.2).
-git-p4.binary::
+git-p4.p4program::
Specifies the p4 executable used by git-p4 to process commands.
The default value for Windows is `p4.exe` and for all other
systems the default is `p4`.
diff --git a/git-p4.py b/git-p4.py
index 160d966ee1..4fbb7344f1 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -88,7 +88,7 @@ def p4_build_cmd(cmd):
can be done more easily.
"""
# Look for the P4 binary
- p4bin = gitConfig("git-p4.binary")
+ p4bin = gitConfig("git-p4.p4program")
real_cmd = []
if p4bin != "":
if path.exists(p4bin):
--
gitgitgadget
