diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-07-07 21:53:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-07-07 21:53:22 +0000 |
| commit | 7a4a283105c6ac21fcd7df88cf6a698281c2cd19 (patch) | |
| tree | 9f36d659a94bca1891c86eb4cc9d7cb975806743 /git-rerere.txt | |
| parent | 330aae6bbe14d97917b66994484cabd0307d1873 (diff) | |
| download | git-htmldocs-7a4a283105c6ac21fcd7df88cf6a698281c2cd19.tar.gz | |
Autogenerated HTML docs for v1.5.3-rc0-63-gc956
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index 7ff9b05e6..c4d426323 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -23,7 +23,7 @@ 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 +You need to set the config variable rerere.enabled to enable this command. @@ -171,7 +171,7 @@ records it if it is a new conflict, or reuses the earlier hand 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 |