Re: [PATCH] Grammar fixes to "merge" and "patch-id" docs
Wincent Colaiuta <win@wincent.com> writes:
> If you tried a merge which resulted in a complex conflicts and
> -would want to start over, you can recover with 'git-reset'.
> +want to start over, you can recover with 'git-reset'.
Reads Ok to me either way...
Show 11 quoted lines
> diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
> index 1276f85..ee7f754 100644
> --- a/Documentation/merge-strategies.txt
> +++ b/Documentation/merge-strategies.txt
> @@ -3,15 +3,15 @@ MERGE STRATEGIES
>
> resolve::
> This can only resolve two heads (i.e. the current branch
> - and another branch you pulled from) using 3-way merge
> + and another branch you pulled from) using a 3-way merge
> algorithm. It tries to carefully detect criss-cross
Hmph, would that be an 'a' or 'the'?
Show 7 quoted lines
> recursive::
> - This can only resolve two heads using 3-way merge
> - algorithm. When there are more than one common
> - ancestors that can be used for 3-way merge, it creates a
> + This can only resolve two heads using a 3-way merge
> + algorithm. When there is more than one common
> + ancestor that can be used for 3-way merge, it creates a
Do you need an article before the latter "3-way merge", perhaps "the"?
Show 8 quoted lines
> @@ -22,11 +22,11 @@ recursive::
> pulling or merging one branch.
>
> octopus::
> - This resolves more than two-head case, but refuses to do
> - complex merge that needs manual resolution. It is
> + This resolves the more than two-heads case, but refuses to do
> + a complex merge that needs manual resolution. It is
Perhaps "resolves cases with more than two heads" is easier to read?
Junio C Hamano <gitster@pobox.com>