Skip to content

Commit 25dcc0d

Browse files
jrngitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0f8a02c commit 25dcc0d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Documentation/config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ branch.<name>.merge::
539539

540540
branch.<name>.mergeoptions::
541541
Sets default options for merging into branch <name>. The syntax and
542-
supported options are equal to that of linkgit:git-merge[1], but
542+
supported options are the same as those of linkgit:git-merge[1], but
543543
option values containing whitespace characters are currently not
544544
supported.
545545

Documentation/git-merge.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ include::merge-config.txt[]
5050

5151
branch.<name>.mergeoptions::
5252
Sets default options for merging into branch <name>. The syntax and
53-
supported options are equal to that of 'git-merge', but option values
54-
containing whitespace characters are currently not supported.
53+
supported options are the same as those of 'git merge', but option
54+
values containing whitespace characters are currently not supported.
5555

5656
HOW MERGE WORKS
5757
---------------

0 commit comments

Comments
 (0)