kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Fix git-rerere documentation 

rerere.enabled is _not_ on by default.  The command is enabled if rr-cache
exists even when rerere.enabled is missing, and enabled or disabled by
explicitly setting the rerere.enabled variable.
maint
Junio C Hamano 2008-01-14 15:10:38 -08:00
parent e87e22d0f2
commit 11c57e6a9a
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/config.txt
View File

@ -543,8 +543,8 @@ rerere.enabled::
Activate recording of resolved conflicts, so that identical Activate recording of resolved conflicts, so that identical
conflict hunks can be resolved automatically, should they conflict hunks can be resolved automatically, should they
be encountered again. linkgit:git-rerere[1] command is by be encountered again. linkgit:git-rerere[1] command is by
default enabled, but can be disabled by setting this option to default enabled if you create `rr-cache` directory under
false. `$GIT_DIR`, but can be disabled by setting this option to false.


gitcvs.enabled:: gitcvs.enabled::
Whether the CVS server interface is enabled for this repository. Whether the CVS server interface is enabled for this repository.

4
Documentation/git-rerere.txt
View File

@ -22,6 +22,10 @@ automerge results and corresponding hand-resolve results on the
initial manual merge, and later by noticing the same automerge initial manual merge, and later by noticing the same automerge
results and applying the previously recorded hand resolution. results and applying the previously recorded hand resolution.


[NOTE]
You need to set the configuration variable rerere.enabled to
enable this command.



COMMANDS COMMANDS
-------- --------

1
Makefile
View File

@ -1187,3 +1187,4 @@ check-docs::
# #
check-builtins:: check-builtins::
./check-builtins.sh ./check-builtins.sh