Re: [PATCH] Random typofixes.

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 22, 2013, 23:06 UTC
Message-ID: <7vfvv69ov9.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20130722210223.GA26492@domone.kolej.mff.cuni.cz>

Ondřej Bílka <neleai@seznam.cz> writes:

Show 14 quoted lines

> Hi, this is refactored version of my previous typofix patch. I avoid
> here controversional fixes.
> I am writing a https://github.com/neleai/stylepp tool to handle
> various style issues.
>
> To simplify review I wrote a utility:
>
> stylepp_strip_diff
>
> That takes a patch file, strips surrounding lines and prints intervals
> that were changes.
>
> Its output is below and patch follows:
> ...

Next time please omit all of the above. We can test-apply and then run "diff --word-diff" to get a comparison that is much easier to read.

Show 10 quoted lines

> diff --git a/Documentation/RelNotes/1.8.2.txt b/Documentation/RelNotes/1.8.2.txt
> index fc606ae..5da2a9d 100644
> --- a/Documentation/RelNotes/1.8.2.txt
> +++ b/Documentation/RelNotes/1.8.2.txt
> @@ -67,7 +67,7 @@ UI, Workflows & Features
>   * The completion script (in contrib/completion) used to let the
>     default completer to suggest pathnames, which gave too many
>     irrelevant choices (e.g. "git add" would not want to add an
> -   unmodified path).  It learnt to use a more git-aware logic to
> +   unmodified path).  It learned to use a more git-aware logic to

I'd leave the original as-is (cf. http://bit.ly/1bH8OlT).

Show 10 quoted lines

> diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt
> index 84dd839..29a7cfa 100644
> --- a/Documentation/howto/revert-branch-rebase.txt
> +++ b/Documentation/howto/revert-branch-rebase.txt
> @@ -12,7 +12,7 @@ How to revert an existing commit
>  ================================
>  
>  One of the changes I pulled into the 'master' branch turns out to
> -break building Git with GCC 2.95.  While they were well intentioned
> +break building Git with GCC 2.95.  While they were well intended

Likewise (cf. http://bit.ly/12HZx4x), but it needs a hyphen between these two words, which I'll add before applying the patch.

Show 11 quoted lines

> diff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt
> index f716d6d..242a044 100644
> --- a/Documentation/technical/racy-git.txt
> +++ b/Documentation/technical/racy-git.txt
> @@ -46,7 +46,7 @@ because in-core timestamps can have finer granularity than
>  on-disk timestamps, resulting in meaningless changes when an
>  inode is evicted from the inode cache.  See commit 8ce13b0
>  of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git
> -([PATCH] Sync in core time granuality with filesystems,
> +([PATCH] Sync in core time granularity with filesystems,
>  2005-01-04).

This is dubious, as it is referring to what is already cast in stone, but I'll apply the update as-is, with the rest of the patch.

Thanks.  It really shows we cannot spell X-<.