summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-19 10:42:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-19 10:42:57 -0700
commite6d6911941fb0d078453a44ec840af57e6578676 (patch)
treebb8a8b4f865f731dfe4fff87a6b46e09aec55699 /git-p4.py
parentMerge branch 'wk/doc-git-has-grown' into maint (diff)
parentrandom typofixes (committed missing a 't', successful missing an 's') (diff)
downloadtgif-e6d6911941fb0d078453a44ec840af57e6578676.tar.xz
Merge branch 'vl/typofix' into maint
* vl/typofix: random typofixes (committed missing a 't', successful missing an 's')
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 911bbce6c5..88fcf232e5 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3168,7 +3168,7 @@ class P4Rebase(Command):
if os.system("git update-index --refresh") != 0:
die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up-to-date or stash away all your changes with git stash.");
if len(read_pipe("git diff-index HEAD --")) > 0:
- die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");
+ die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
[upstream, settings] = findUpstreamBranchPoint()
if len(upstream) == 0: