| commit | 082c15ade1833e80a65c36d2499676a924d6d6aa | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Mar 2019 00:59:58 +0000 (7 09:59 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Mar 2019 00:59:58 +0000 (7 09:59 +0900) | ||
| tree | 2b648a2506aab4873a188668968ef005fc9589d3 | treesnapshot (tar.gz zip) |
| parent | b0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8 | commitdiff |
| parent | 1ede45e44b3b3bef8598ca077a60a6483ede99ae | commitdiff |
Merge branch 'en/merge-options-doc'
Doc update.
* en/merge-options-doc:
merge-options.txt: correct wording of --no-commit option
Doc update.
* en/merge-options-doc:
merge-options.txt: correct wording of --no-commit option