tests: propagate $(TAR) down from the toplevel Makefile

[git.git] / Documentation / git-rerere.txt

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 8ce492c8f2738275aa951f2fd98f1bcca16baee6..8030ec4d01de8cf2c7a62a7b1fd8d917e6d14b53 100644 (file)
--- a/Documentation/git-rerere.txt
+++ b/Documentation/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.
 
 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
 --------
 
 COMMANDS
 --------


@@ -33,7 +37,7 @@ its working state.
 'clear'::
 
 This resets the metadata used by rerere if a merge resolution is to be
 'clear'::
 
 This resets the metadata used by rerere if a merge resolution is to be

-is aborted.  Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1]
+is aborted.  Calling linkgit:git-am[1] --skip or linkgit:git-rebase[1]

 [--skip|--abort] will automatically invoke this command.
 
 'diff'::
 [--skip|--abort] will automatically invoke this command.
 
 'diff'::


@@ -204,4 +208,4 @@ Written by Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
 
 GIT
 ---

-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite