summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-05 18:56:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-05 18:56:53 (GMT)
commitad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37 (patch)
tree7b8f807cb10afdb7e94e090f7bedc3e7faf36429 /Documentation
parent16adc7cb048f9c31e80b4409aa599d485595c4e0 (diff)
parent6b097788f88a29d6e171af7a9e87117cf992e833 (diff)
downloadgit-ad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37.zip
git-ad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37.tar.gz
git-ad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37.tar.bz2
Merge branch 'maint'
* maint: t0006: test timezone parsing rerere.txt: Document forget subcommand Documentation/git-gc.txt: add reference to githooks
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-gc.txt7
-rw-r--r--Documentation/git-rerere.txt7
2 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index a9e0882..315f07e 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -137,6 +137,13 @@ If you are expecting some objects to be collected and they aren't, check
all of those locations and decide whether it makes sense in your case to
remove those references.
+HOOKS
+-----
+
+The 'git gc --auto' command will run the 'pre-auto-gc' hook. See
+linkgit:githooks[5] for more information.
+
+
SEE ALSO
--------
linkgit:git-prune[1]
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index acc220a..db99d47 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
SYNOPSIS
--------
-'git rerere' ['clear'|'diff'|'status'|'gc']
+'git rerere' ['clear'|'forget' [<pathspec>]|'diff'|'status'|'gc']
DESCRIPTION
-----------
@@ -40,6 +40,11 @@ This resets the metadata used by rerere if a merge resolution is to be
aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]'
will automatically invoke this command.
+'forget' <pathspec>::
+
+This resets the conflict resolutions which rerere has recorded for the current
+conflict in <pathspec>. The <pathspec> is optional.
+
'diff'::
This displays diffs for the current state of the resolution. It is