From: Jonathan Nieder Date: Fri, 09 Oct 2009 18:51:14 GMT Subject: [PATCH 3-4/9 v2] Documentation: clarify mergeoptions description Message-ID: <20091009185114.GA3610@progeny.tock> In-Reply-To: <20091009101743.GD16558@progeny.tock> Sounds better this way, at least to my ears. ("The syntax and supported options of git merge" is a plural noun. "the same" instead of "equal" sounds less technical and seems to convey the meaning better here.) Signed-off-by: Jonathan Nieder --- Sean Estabrooks wrote: > P.S. Patches 3 and 4 in this series would be better as a single patch. Good idea. Here's a squashed version. Documentation/config.txt | 2 +- Documentation/git-merge.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index be0b8ca..cd17814 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -539,7 +539,7 @@ branch..merge:: branch..mergeoptions:: Sets default options for merging into branch . The syntax and - supported options are equal to that of linkgit:git-merge[1], but + supported options are the same as those of linkgit:git-merge[1], but option values containing whitespace characters are currently not supported. diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 354e9d9..6ffd4b0 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -50,8 +50,8 @@ include::merge-config.txt[] branch..mergeoptions:: Sets default options for merging into branch . The syntax and - supported options are equal to that of 'git-merge', but option values - containing whitespace characters are currently not supported. + supported options are the same as those of 'git-merge', but option + values containing whitespace characters are currently not supported. HOW MERGE WORKS --------------- -- 1.6.5.rc1.199.g596ec