From mboxrd@z Thu Jan 1 00:00:00 1970 From: Veres Lajos Subject: small misspellings fixes Date: Wed, 19 Jun 2013 07:37:24 +0200 (CEST) Message-ID: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Jun 19 07:45:14 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UpBCj-0005b7-4o for gcvg-git-2@plane.gmane.org; Wed, 19 Jun 2013 07:45:13 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753867Ab3FSFpH (ORCPT ); Wed, 19 Jun 2013 01:45:07 -0400 Received: from [188.227.225.139] ([188.227.225.139]:53849 "EHLO citymarket.hu" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752001Ab3FSFpG (ORCPT ); Wed, 19 Jun 2013 01:45:06 -0400 X-Greylist: delayed 458 seconds by postgrey-1.27 at vger.kernel.org; Wed, 19 Jun 2013 01:45:06 EDT Received: from citymarket.hu (localhost [127.0.0.1]) by citymarket.hu (Postfix) with ESMTP id EFD5A102158 for ; Wed, 19 Jun 2013 07:37:24 +0200 (CEST) Received: by citymarket.hu (Postfix, from userid 1000) id D8E3A102220; Wed, 19 Jun 2013 07:37:24 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by citymarket.hu (Postfix) with ESMTP id D223E102158 for ; Wed, 19 Jun 2013 07:37:24 +0200 (CEST) User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: small misspellings fixes Signed-off-by: Veres Lajos --- 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 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: diff --git a/git-svn.perl b/git-svn.perl index d070de0..4e8275f 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1246,7 +1246,7 @@ sub cmd_rebase { return; } if (command(qw/diff-index HEAD --/)) { - print STDERR "Cannot rebase with uncommited changes:\n"; + print STDERR "Cannot rebase with uncommitted changes:\n"; command_noisy('status'); exit 1; } diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 2f70433..460d8eb 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -316,7 +316,7 @@ test_expect_success 'merge c1 with c2 (squash)' ' test_debug 'git log --graph --decorate --oneline --all' -test_expect_success 'unsuccesful merge of c1 with c2 (squash, ff-only)' ' +test_expect_success 'unsuccessful merge of c1 with c2 (squash, ff-only)' ' git reset --hard c1 && test_must_fail git merge --squash --ff-only c2 ' -- Hi, I am trying to convert this pull request: https://github.com/git/git/pull/42 to a proper patch email (Sorry If I miss something about the process.) -- Veres Lajos vlajos@gmail.com +36 20 438 5909