diff options
author | Veres Lajos <vlajos@gmail.com> | 2013-06-19 07:37:24 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-06-19 11:31:33 -0700 |
commit | f7e604ed390cec7b20471f9c03bbc507ebfe41c0 (patch) | |
tree | f5bcf2eeb9d9248b307b40e5c067c33c6628a5ef /git-p4.py | |
parent | t0070 "mktemp to unwritable directory" needs SANITY (diff) | |
download | tgif-f7e604ed390cec7b20471f9c03bbc507ebfe41c0.tar.xz |
random typofixes (committed missing a 't', successful missing an 's')
Signed-off-by: Veres Lajos <vlajos@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-x | git-p4.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3153,7 +3153,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: |