| commit | 25dcc0d64b9f3c11abcd0f53a9b9cdb6092ed646 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Fri, 9 Oct 2009 18:51:14 +0000 (9 13:51 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 Oct 2009 21:43:04 +0000 (9 14:43 -0700) | ||
| tree | 63b60797ace5c81b6cf44a7f1ae0338c2dc8885d | treesnapshot (tar.gz zip) |
| parent | 0f8a02c640397ce22080e1c2eaa5029388638589 | commitdiff |
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>
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 | diffblobblamehistory | |
| Documentation/git-merge.txt | diffblobblamehistory |