undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: clarify mergeoptions description

Browse Source 
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:
Jonathan Nieder 2009-10-09 13:51:14 -05:00 committed by Junio C Hamano
parent 0f8a02c640
commit 25dcc0d64b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -539,7 +539,7 @@ branch.<name>.merge::
branch.<name>.mergeoptions:: branch.<name>.mergeoptions::
Sets default options for merging into branch <name>. The syntax and 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 option values containing whitespace characters are currently not
supported. supported.

4
Documentation/git-merge.txt
View File

@ -50,8 +50,8 @@ include::merge-config.txt[]
branch.<name>.mergeoptions:: branch.<name>.mergeoptions::
Sets default options for merging into branch <name>. The syntax and Sets default options for merging into branch <name>. The syntax and
supported options are equal to that of 'git-merge', but option values supported options are the same as those of 'git merge', but option
containing whitespace characters are currently not supported. values containing whitespace characters are currently not supported.
HOW MERGE WORKS HOW MERGE WORKS
--------------- ---------------