From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Jul 2010 18:56:53 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37?ds=inline;hp=-c

Merge branch 'maint'

* maint:
t0006: test timezone parsing
rerere.txt: Document forget subcommand
Documentation/git-gc.txt: add reference to githooks
---

ad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37
diff --combined Documentation/git-gc.txt
index a9e0882e9b,cbe74d531a..315f07ef1c
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@@ -88,16 -88,6 +88,16 @@@ commits prior to the amend or rebase oc
  are not part of the current project most users will want to expire
  them sooner.  This option defaults to '30 days'.
  
 +The above two configuration variables can be given to a pattern.  For
 +example, this sets non-default expiry values only to remote tracking
 +branches:
 +
 +------------
 +[gc "refs/remotes/*"]
 +	reflogExpire = never
 +	reflogexpireUnreachable = 3 days
 +------------
 +
  The optional configuration variable 'gc.rerereresolved' indicates
  how long records of conflicted merge you resolved earlier are
  kept.  This defaults to 60 days.
@@@ -137,6 -127,13 +137,13 @@@ If you are expecting some objects to b
  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]