]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/config.txt
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0f8a02c) | patch
Documentation: clarify mergeoptions description
authorJonathan Nieder <jrnieder@gmail.com>
Fri, 9 Oct 2009 18:51:14 +0000 (13:51 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Oct 2009 21:43:04 +0000 (14:43 -0700)
commit25dcc0d64b9f3c11abcd0f53a9b9cdb6092ed646
tree63b60797ace5c81b6cf44a7f1ae0338c2dc8885dtree | snapshot
parent0f8a02c640397ce22080e1c2eaa5029388638589commit | diff
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>
Documentation/config.txt diff | blob | blame | history
Documentation/git-merge.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.