diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-06-27 00:07:52 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 00:07:52 +0200 |
commit | eac9a1a1953bcd89678f649a1efbc8d1a7de9f40 (patch) | |
tree | f1ee4de6d7e78c5eae79db730d727c293d50e5b8 /git-p4.py | |
parent | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' (diff) | |
parent | random typofixes (committed missing a 't', successful missing an 's') (diff) | |
download | git-eac9a1a1953bcd89678f649a1efbc8d1a7de9f40.tar.xz git-eac9a1a1953bcd89678f649a1efbc8d1a7de9f40.zip |
Merge branch 'vl/typofix'
* vl/typofix:
random typofixes (committed missing a 't', successful missing an 's')
Diffstat (limited to 'git-p4.py')
-rwxr-xr-x | git-p4.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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: |