index 7ff9b05e680cabc6513f9d8a6aa80eb7eccda82d..8ce492c8f2738275aa951f2fd98f1bcca16baee6 100644 (file)
initial manual merge, and later by noticing the same automerge
results and applying the previously recorded hand resolution.
initial manual merge, and later by noticing the same automerge
results and applying the previously recorded hand resolution.
-[NOTE]
-You need to create `$GIT_DIR/rr-cache` directory to enable this
-command.
-
COMMANDS
--------
COMMANDS
--------
resolve when it is not. `git-commit` also invokes `git-rerere`
when recording a merge result. What this means is that you do
not have to do anything special yourself (Note: you still have
resolve when it is not. `git-commit` also invokes `git-rerere`
when recording a merge result. What this means is that you do
not have to do anything special yourself (Note: you still have
-to create `$GIT_DIR/rr-cache` directory to enable this command).
+to set the config variable rerere.enabled to enable this command).
In our example, when you did the test merge, the manual
resolution is recorded, and it will be reused when you do the
In our example, when you did the test merge, the manual
resolution is recorded, and it will be reused when you do the