diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-07-29 08:35:21 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-07-29 08:35:21 +0000 |
| commit | 543f8d61eb235820aecefde6e46ec90e9803a6d8 (patch) | |
| tree | 927a67cd988e0c71e5bb57625adf32abcbdbb947 /git-rerere.txt | |
| parent | ceec6ab20672c752adf280cfbacca126f01b7411 (diff) | |
| download | git-htmldocs-543f8d61eb235820aecefde6e46ec90e9803a6d8.tar.gz | |
Autogenerated HTML docs for v1.6.4
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index a53c3cd35..7dd515b8c 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -23,7 +23,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 to +You need to set the configuration variable rerere.enabled in order to enable this command. |