summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-26 22:07:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-26 22:07:52 (GMT)
commiteac9a1a1953bcd89678f649a1efbc8d1a7de9f40 (patch)
treef1ee4de6d7e78c5eae79db730d727c293d50e5b8 /git-p4.py
parent2ddc898bc0d0c3f03b4aeeb34c33f652d95f2807 (diff)
parentf7e604ed390cec7b20471f9c03bbc507ebfe41c0 (diff)
downloadgit-eac9a1a1953bcd89678f649a1efbc8d1a7de9f40.zip
git-eac9a1a1953bcd89678f649a1efbc8d1a7de9f40.tar.gz
git-eac9a1a1953bcd89678f649a1efbc8d1a7de9f40.tar.bz2
Merge branch 'vl/typofix'
* 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 911bbce..88fcf23 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: