Merge branch 'maint'
commitad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Jul 2010 18:56:53 +0000 (5 11:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Jul 2010 18:56:53 +0000 (5 11:56 -0700)
tree7b8f807cb10afdb7e94e090f7bedc3e7faf36429
parent16adc7cb048f9c31e80b4409aa599d485595c4e0
parent6b097788f88a29d6e171af7a9e87117cf992e833
Merge branch 'maint'

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