diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2011-01-03 20:03:34 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-04 11:23:42 -0800 |
| commit | 469bfc962df22a87f0f0c60699d91fa9e647492a (patch) | |
| tree | c8df5ac96e73af367892db2eef999feeabbb2738 /Documentation/git-fmt-merge-msg.txt | |
| parent | 01b97a4cb60723d18b437efdc474503d2a9dd384 (diff) | |
| download | git-469bfc962df22a87f0f0c60699d91fa9e647492a.tar.gz | |
Fix typos in the documentation
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fmt-merge-msg.txt')
| -rw-r--r-- | Documentation/git-fmt-merge-msg.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 40dba8c0a9..75adf7a502 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/git-fmt-merge-msg.txt @@ -57,7 +57,7 @@ merge.log:: In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and - true is a synoym for 20. + true is a synonym for 20. merge.summary:: Synonym to `merge.log`; this is deprecated and will be removed in |