Merge branch 'jc/prune-all'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 May 2013 21:23:03 +0000 (14:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 May 2013 21:23:04 +0000 (14:23 -0700)
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()

1  2 
Documentation/git-reflog.txt
Documentation/technical/api-parse-options.txt
builtin/reflog.c
cache.h
date.c
parse-options.h
Simple merge
Simple merge
Simple merge
diff --cc cache.h
Simple merge
diff --cc date.c
Simple merge
diff --cc parse-options.h
Simple merge