diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-01-15 08:31:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-01-15 08:31:10 +0000 |
| commit | 0e47b23874132a7fffde3f56c7c4f13c1f0b8cc4 (patch) | |
| tree | 224e0c2eaf36a7f35e3ef9cdc924a2f02ae3be06 /git-rerere.txt | |
| parent | e77b015d156771d6b32769e7997c455adf9db4ab (diff) | |
| download | git-htmldocs-0e47b23874132a7fffde3f56c7c4f13c1f0b8cc4.tar.gz | |
Autogenerated HTML docs for v1.5.4-rc3-11-g4e67
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index 3793267da..a53858e25 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -22,6 +22,10 @@ automerge results and corresponding hand-resolve results on the initial manual merge, and later by noticing the same automerge results and applying the previously recorded hand resolution. +[NOTE] +You need to set the configuration variable rerere.enabled to +enable this command. + COMMANDS -------- |