From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 May 2013 21:23:03 +0000 (-0700)
Subject: Merge branch 'jc/prune-all'
X-Git-Tag: v1.8.4-rc0~254
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e1e7624aa2aa39890ca49d0f7bd3af397c22b03;p=thirdparty%2Fgit.git

Merge branch 'jc/prune-all'

We used the approxidate() parser for "--expire=<timestamp>" options
of various commands, but it is better to treat --expire=all and
--expire=now a bit more specially than using the current timestamp.
Update "git gc" and "git reflog" with a new parsing function for
expiry dates.

* jc/prune-all:
  prune: introduce OPT_EXPIRY_DATE() and use it
  api-parse-options.txt: document "no-" for non-boolean options
  git-gc.txt, git-reflog.txt: document new expiry options
  date.c: add parse_expiry_date()
---

3e1e7624aa2aa39890ca49d0f7bd3af397c22b03