diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-25 07:41:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 07:41:19 (GMT) |
| commit | 98a8fcc82b35c2bc9325c39f19bfa05e6e306662 (patch) | |
| tree | 5dec28c075cf53c242726f3176b4a0a92371b9bf /Documentation | |
| parent | 425e51e54d03a510904b9bb10b43a7635f2d085f (diff) | |
| parent | fe61ccbc35f94212a486c4c7c50d6e7db2df94c7 (diff) | |
| download | git-98a8fcc82b35c2bc9325c39f19bfa05e6e306662.zip git-98a8fcc82b35c2bc9325c39f19bfa05e6e306662.tar.gz git-98a8fcc82b35c2bc9325c39f19bfa05e6e306662.tar.bz2 | |
Merge branch 'po/rerere-doc-fmt'
Docfix.
* po/rerere-doc-fmt:
rerere doc: quote `rerere.enabled`
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rerere.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index df310d2..95763d7 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -24,7 +24,7 @@ on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results. [NOTE] -You need to set the configuration variable rerere.enabled in order to +You need to set the configuration variable `rerere.enabled` in order to enable this command. |