diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2009-10-09 13:51:14 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-09 14:43:04 -0700 |
| commit | 25dcc0d64b9f3c11abcd0f53a9b9cdb6092ed646 (patch) | |
| tree | 63b60797ace5c81b6cf44a7f1ae0338c2dc8885d | |
| parent | 0f8a02c640397ce22080e1c2eaa5029388638589 (diff) | |
| download | git-25dcc0d64b9f3c11abcd0f53a9b9cdb6092ed646.tar.gz | |
Documentation: clarify mergeoptions description
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 <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-merge.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index be0b8cacaa..cd1781498e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -539,7 +539,7 @@ branch.<name>.merge:: branch.<name>.mergeoptions:: Sets default options for merging into branch <name>. 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 ac9f17a11e..d05f324462 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -50,8 +50,8 @@ include::merge-config.txt[] branch.<name>.mergeoptions:: Sets default options for merging into branch <name>. 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 --------------- |