diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-12-13 21:32:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-12-13 21:32:17 +0000 |
| commit | e7935c49199b7d60c02043382b62ce70d36017e9 (patch) | |
| tree | 280d09d89444d318008e632fbb9c9d88a393cacf /git-rerere.html | |
| parent | 3f403b04bd95096f37297ab2cfbd4ad1f6dbb904 (diff) | |
| download | git-htmldocs-e7935c49199b7d60c02043382b62ce70d36017e9.tar.gz | |
Autogenerated HTML docs for v1.4.4.2-g1d77
Diffstat (limited to 'git-rerere.html')
| -rw-r--r-- | git-rerere.html | 51 |
1 files changed, 49 insertions, 2 deletions
diff --git a/git-rerere.html b/git-rerere.html index e311b6170..aee041597 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -272,7 +272,7 @@ git-rerere(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-rerere</em></p>
+<p><em>git-rerere</em> [clear|diff|status]</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -294,6 +294,53 @@ command.</td> </tr></table>
</div>
</div>
+<h2>COMMANDS</h2>
+<div class="sectionbody">
+<p>Normally, git-rerere is run without arguments or user-intervention.
+However, it has several commands that allow it to interact with
+its working state.</p>
+<dl>
+<dt>
+<em>clear</em>
+</dt>
+<dd>
+<p>
+This resets the metadata used by rerere if a merge resolution is to be
+is aborted. Calling <a href="git-am.html">git-am(1)</a> --skip or <a href="git-rebase.html">git-rebase(1)</a>
+[--skip|--abort] will automatcally invoke this command.
+</p>
+</dd>
+<dt>
+<em>diff</em>
+</dt>
+<dd>
+<p>
+This displays diffs for the current state of the resolution. It is
+useful for tracking what has changed while the user is resolving
+conflicts. Additional arguments are passed directly to the system
+diff(1) command installed in PATH.
+</p>
+</dd>
+<dt>
+<em>status</em>
+</dt>
+<dd>
+<p>
+Like diff, but this only prints the filenames that will be tracked
+for resolutions.
+</p>
+</dd>
+<dt>
+<em>gc</em>
+</dt>
+<dd>
+<p>
+This command is used to prune records of conflicted merge that
+occurred long time ago.
+</p>
+</dd>
+</dl>
+</div>
<h2>DISCUSSION</h2>
<div class="sectionbody">
<p>When your topic branch modifies overlapping area that your
@@ -431,7 +478,7 @@ conflict.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 03-Oct-2006 08:41:23 UTC
+Last updated 13-Dec-2006 21:32:08 UTC
</div>
</div>
</body>
|