Re: [PATCH v2] Fix various typos and grammaros

2013-04-12 Thread Junio C Hamano 
Stefano Lattarini  writes:

> Hi Junio.
>
> On 04/12/2013 02:45 AM, Junio C Hamano wrote:
>> Stefano Lattarini  writes:
>> 
>> How much of this stuff have interact with real changes that are in
>> flight, with various doneness cooking in different integration
>> branches?
>> 
> I don't know, since I only follow the master branch of Git.  And
> honestly, I don't have time right now to go checking for possible
> conflicts, or to resubmit ...   But I see Jonathan has taken up
> the ball on this (thanks Jonathan!), so I'll leave the matter to
> him.

Yeah, that's OK.  Thanks.

> Next time I'll try to prepare a patch broken up in more digestible
> pieces, so that it will be easier for you to deal with conflicts,
> and/or to selectively decide which fixes are worth applying.
>
> Thanks, and sorry for the confusion,
>   Stefano
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [RFC/PATCH maint 0/10] Re: [PATCH v2] Fix various typos and grammaros

2013-04-12 Thread Junio C Hamano 
Jonathan Nieder  writes:

> Hi,
>
> Junio C Hamano wrote:
>
>> How much of this stuff have interact with real changes that are in
>> flight, with various doneness cooking in different integration
>> branches?
>
> All except the t3511-cherry-pick-x.sh change apply cleanly to
> "maint" and merge without trouble with master and pu.
>
> Here is a split-up version.

Thanks.

> I haven't looked closely at the patch,
> even to sanity check it --- one of the main points of splitting it
> this way is to make it easier to review with reference to code
> borrowed from other projects.

Sure.

> Some of these patches need more work if they are to be applied.  For
> example, git-gui is maintained separately and should not be patched
> from the toplevel.

True.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] Fix various typos and grammaros

2013-04-12 Thread Stefano Lattarini 
Hi Junio.

On 04/12/2013 02:45 AM, Junio C Hamano wrote:
> Stefano Lattarini  writes:
> 
> How much of this stuff have interact with real changes that are in
> flight, with various doneness cooking in different integration
> branches?
> 
I don't know, since I only follow the master branch of Git.  And
honestly, I don't have time right now to go checking for possible
conflicts, or to resubmit ...   But I see Jonathan has taken up
the ball on this (thanks Jonathan!), so I'll leave the matter to
him.

Next time I'll try to prepare a patch broken up in more digestible
pieces, so that it will be easier for you to deal with conflicts,
and/or to selectively decide which fixes are worth applying.

Thanks, and sorry for the confusion,
  Stefano
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[RFC/PATCH maint 0/10] Re: [PATCH v2] Fix various typos and grammaros

2013-04-11 Thread Jonathan Nieder 
Hi,

Junio C Hamano wrote:

> How much of this stuff have interact with real changes that are in
> flight, with various doneness cooking in different integration
> branches?

All except the t3511-cherry-pick-x.sh change apply cleanly to
"maint" and merge without trouble with master and pu.

Here is a split-up version.  I haven't looked closely at the patch,
even to sanity check it --- one of the main points of splitting it
this way is to make it easier to review with reference to code
borrowed from other projects.

I left out the change to compat/nedmalloc/Readme.txt, since it is
changing a historical record, and to
contrib/mw-to-git/t/t9360-mw-to-git-clone.sh, because it seems
realistic to allow the nyan cat to demonstrate poor punctuation
skills.

Some of these patches need more work if they are to be applied.  For
example, git-gui is maintained separately and should not be patched
from the toplevel.

Hope that helps,
Jonathan

Stefano Lattarini (10):
  doc: various spelling fixes
  git-remote-mediawiki: spelling fixes
  contrib/subtree: fix spelling of "accidentally"
  obstack: fix spelling of "similar"
  compat/regex: fix spelling and grammar in comments
  compat/nedmalloc: fix spelling in comments
  precompose-utf8: fix spelling of "want" in error message
  kwset: fix spelling in comments
  git-gui: fix spelling in comments
  Correct common spelling mistakes in comments and tests

 Documentation/git-credential.txt   |  2 +-
 Documentation/git-remote-ext.txt   |  2 +-
 Documentation/git-svn.txt  |  4 ++--
 Documentation/git-tools.txt|  2 +-
 Documentation/revisions.txt|  2 +-
 Documentation/technical/api-argv-array.txt |  2 +-
 Documentation/technical/api-credentials.txt|  2 +-
 Documentation/technical/api-ref-iteration.txt  |  2 +-
 builtin/apply.c|  6 +++---
 commit.c   |  2 +-
 commit.h   |  2 +-
 compat/nedmalloc/malloc.c.h|  6 +++---
 compat/obstack.h   |  2 +-
 compat/precompose_utf8.c   |  2 +-
 compat/regex/regcomp.c |  4 ++--
 compat/regex/regex.c   |  2 +-
 compat/regex/regex_internal.c  |  6 +++---
 contrib/mw-to-git/git-remote-mediawiki.perl|  6 +++---
 contrib/mw-to-git/t/README |  6 +++---
 contrib/mw-to-git/t/install-wiki/LocalSettings.php |  2 +-
 contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh| 14 +++---
 contrib/subtree/t/t7900-subtree.sh |  2 +-
 diff.c |  2 +-
 git-add--interactive.perl  |  2 +-
 git-cvsserver.perl |  4 ++--
 git-gui/lib/blame.tcl  |  2 +-
 git-gui/lib/index.tcl  |  2 +-
 git-gui/lib/spellcheck.tcl |  4 ++--
 git-quiltimport.sh |  2 +-
 gitweb/INSTALL |  2 +-
 gitweb/gitweb.perl |  6 +++---
 kwset.c|  4 ++--
 perl/Git.pm|  2 +-
 perl/Git/I18N.pm   |  2 +-
 perl/private-Error.pm  |  2 +-
 po/README  |  6 +++---
 sequencer.c|  2 +-
 t/t1006-cat-file.sh|  2 +-
 t/t3701-add-interactive.sh |  2 +-
 t/t4014-format-patch.sh|  6 +++---
 t/t4124-apply-ws-rule.sh   |  2 +-
 t/t6030-bisect-porcelain.sh|  2 +-
 t/t7601-merge-pull-config.sh   |  2 +-
 t/t7610-mergetool.sh   |  2 +-
 t/t9001-send-email.sh  |  4 ++--
 transport-helper.c |  2 +-
 transport.h|  2 +-
 xdiff/xdiffi.c |  2 +-
 xdiff/xhistogram.c |  2 +-
 49 files changed, 77 insertions(+), 77 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] Fix various typos and grammaros

2013-04-11 Thread Junio C Hamano 
Stefano Lattarini  writes:

>  Documentation/git-credential.txt   |  2 +-
>  Documentation/git-remote-ext.txt   |  2 +-
>  Documentation/git-svn.txt  |  4 ++--
>  Documentation/git-tools.txt|  2 +-
>  Documentation/revisions.txt|  2 +-
>  Documentation/technical/api-argv-array.txt |  2 +-
>  Documentation/technical/api-credentials.txt|  2 +-
>  Documentation/technical/api-ref-iteration.txt  |  2 +-
>  builtin/apply.c|  6 +++---
>  commit.c   |  2 +-
>  commit.h   |  2 +-
>  compat/nedmalloc/Readme.txt|  2 +-
>  compat/nedmalloc/malloc.c.h|  6 +++---
>  compat/obstack.h   |  2 +-
>  compat/precompose_utf8.c   |  2 +-
>  compat/regex/regcomp.c |  4 ++--
>  compat/regex/regex.c   |  2 +-
>  compat/regex/regex_internal.c  |  6 +++---
>  contrib/mw-to-git/git-remote-mediawiki.perl|  6 +++---
>  contrib/mw-to-git/t/README |  6 +++---
>  contrib/mw-to-git/t/install-wiki/LocalSettings.php |  2 +-
>  contrib/mw-to-git/t/t9360-mw-to-git-clone.sh   |  2 +-
>  contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh| 14 +++---
>  contrib/subtree/t/t7900-subtree.sh |  2 +-
>  diff.c |  2 +-
>  git-add--interactive.perl  |  2 +-
>  git-cvsserver.perl |  4 ++--
>  git-gui/lib/blame.tcl  |  2 +-
>  git-gui/lib/index.tcl  |  2 +-
>  git-gui/lib/spellcheck.tcl |  4 ++--
>  git-quiltimport.sh |  2 +-
>  gitweb/INSTALL |  2 +-
>  gitweb/gitweb.perl |  6 +++---
>  kwset.c|  4 ++--
>  perl/Git.pm|  2 +-
>  perl/Git/I18N.pm   |  2 +-
>  perl/private-Error.pm  |  2 +-
>  po/README  |  6 +++---
>  sequencer.c|  2 +-
>  t/t1006-cat-file.sh|  2 +-
>  t/t3511-cherry-pick-x.sh   |  4 ++--
>  t/t3701-add-interactive.sh |  2 +-
>  t/t4014-format-patch.sh|  6 +++---
>  t/t4124-apply-ws-rule.sh   |  2 +-
>  t/t6030-bisect-porcelain.sh|  2 +-
>  t/t7601-merge-pull-config.sh   |  2 +-
>  t/t7610-mergetool.sh   |  2 +-
>  t/t9001-send-email.sh  |  4 ++--
>  transport-helper.c |  2 +-
>  transport.h|  2 +-
>  xdiff/xdiffi.c |  2 +-
>  xdiff/xhistogram.c |  2 +-


How much of this stuff have interact with real changes that are in
flight, with various doneness cooking in different integration
branches?

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2] Fix various typos and grammaros

2013-04-11 Thread Stefano Lattarini 
Most typos suggested by codespell:


Grammaros pointed out by Eric Sunshine.

Helped-by: Eric Sunshine 
Signed-off-by: Stefano Lattarini 
---
 Documentation/git-credential.txt   |  2 +-
 Documentation/git-remote-ext.txt   |  2 +-
 Documentation/git-svn.txt  |  4 ++--
 Documentation/git-tools.txt|  2 +-
 Documentation/revisions.txt|  2 +-
 Documentation/technical/api-argv-array.txt |  2 +-
 Documentation/technical/api-credentials.txt|  2 +-
 Documentation/technical/api-ref-iteration.txt  |  2 +-
 builtin/apply.c|  6 +++---
 commit.c   |  2 +-
 commit.h   |  2 +-
 compat/nedmalloc/Readme.txt|  2 +-
 compat/nedmalloc/malloc.c.h|  6 +++---
 compat/obstack.h   |  2 +-
 compat/precompose_utf8.c   |  2 +-
 compat/regex/regcomp.c |  4 ++--
 compat/regex/regex.c   |  2 +-
 compat/regex/regex_internal.c  |  6 +++---
 contrib/mw-to-git/git-remote-mediawiki.perl|  6 +++---
 contrib/mw-to-git/t/README |  6 +++---
 contrib/mw-to-git/t/install-wiki/LocalSettings.php |  2 +-
 contrib/mw-to-git/t/t9360-mw-to-git-clone.sh   |  2 +-
 contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh| 14 +++---
 contrib/subtree/t/t7900-subtree.sh |  2 +-
 diff.c |  2 +-
 git-add--interactive.perl  |  2 +-
 git-cvsserver.perl |  4 ++--
 git-gui/lib/blame.tcl  |  2 +-
 git-gui/lib/index.tcl  |  2 +-
 git-gui/lib/spellcheck.tcl |  4 ++--
 git-quiltimport.sh |  2 +-
 gitweb/INSTALL |  2 +-
 gitweb/gitweb.perl |  6 +++---
 kwset.c|  4 ++--
 perl/Git.pm|  2 +-
 perl/Git/I18N.pm   |  2 +-
 perl/private-Error.pm  |  2 +-
 po/README  |  6 +++---
 sequencer.c|  2 +-
 t/t1006-cat-file.sh|  2 +-
 t/t3511-cherry-pick-x.sh   |  4 ++--
 t/t3701-add-interactive.sh |  2 +-
 t/t4014-format-patch.sh|  6 +++---
 t/t4124-apply-ws-rule.sh   |  2 +-
 t/t6030-bisect-porcelain.sh|  2 +-
 t/t7601-merge-pull-config.sh   |  2 +-
 t/t7610-mergetool.sh   |  2 +-
 t/t9001-send-email.sh  |  4 ++--
 transport-helper.c |  2 +-
 transport.h|  2 +-
 xdiff/xdiffi.c |  2 +-
 xdiff/xhistogram.c |  2 +-
 52 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt
index 472f00f..7da0f13 100644
--- a/Documentation/git-credential.txt
+++ b/Documentation/git-credential.txt
@@ -56,7 +56,7 @@ For example, if we want a password for
 `https://example.com/foo.git`, we might generate the following
 credential description (don't forget the blank line at the end; it
 tells `git credential` that the application finished feeding all the
-infomation it has):
+information it has):
 
 protocol=https
 host=example.com
diff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt
index 58b7fac..8cfc748 100644
--- a/Documentation/git-remote-ext.txt
+++ b/Documentation/git-remote-ext.txt
@@ -86,7 +86,7 @@ begins with `ext::`.  Examples:
edit .ssh/config.
 
 "ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo"::
-   Represents repository with path /somerepo accessable over
+   Represents repository with path /somerepo accessible over
git protocol at abstract namespace address /git-server.
 
 "ext::git-server-alias foo %G/repo"::
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 1b8b649..7706d41 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -245,7 +245,7 @@ first have already been pushed into SVN.
patch), "all" (accept all patches), or "quit".
+
'git svn dcommit' returns immediately if answer if "no" or "quit", 
without
-   commiting anything to SVN.
+   committing anything to SVN.
 
 'branch'::
Crea