mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
0f8a02c640
commit
25dcc0d64b
|
@ -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.
|
||||
|
||||
|
|
|
@ -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
|
||||
---------------
|
||||
|
|
Loading…
Reference in a new issue