Merge branch 'jc/add-refresh-unmerged'

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index a78d9c54931c7fc1f6a693a7f185f08bcb8f6861..d2fd265b1c351b942e8ed3e1aa3f95866b6d965d 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -38,7 +38,7 @@ def p4_build_cmd(cmd):
 
     host = gitConfig("git-p4.host")
     if len(host) > 0:
-        real_cmd += ["-h", host]
+        real_cmd += ["-H", host]
 
     client = gitConfig("git-p4.client")
     if len(client) > 0: