diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-12-05 10:59:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-12-05 10:59:48 +0000 |
| commit | e0facb91f036fe57e82a8d55f86a0a387b8562e6 (patch) | |
| tree | f2692d484243f4610b954bfafa1b9707d8482d5a /git-rerere.txt | |
| parent | 58256872f2578443b3c8aff87ad0304e6b497b1d (diff) | |
| download | git-htmldocs-e0facb91f036fe57e82a8d55f86a0a387b8562e6.tar.gz | |
Autogenerated HTML docs for v1.5.3.7-1066-g7a4a
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index c4d426323..8ce492c8f 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -22,10 +22,6 @@ 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 config variable rerere.enabled to enable this -command. - COMMANDS -------- |