diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:23:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:23:04 -0700 |
| commit | 3e1e7624aa2aa39890ca49d0f7bd3af397c22b03 (patch) | |
| tree | 013e8e03f854c3458c0c90f7298244ef7efb6e56 /Documentation/merge-config.txt | |
| parent | Merge branch 'mh/fetch-into-shallow' (diff) | |
| parent | prune: introduce OPT_EXPIRY_DATE() and use it (diff) | |
| download | tgif-3e1e7624aa2aa39890ca49d0f7bd3af397c22b03.tar.xz | |
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()
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions