summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-06 17:23:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-06 17:23:37 (GMT)
commit6cddb7362ca3c7312b57a4f172bca5c953a45b6c (patch)
tree62b363b31ccae02533ee81eea365cb975ab39cce /Documentation
parent0186e9ebedfb18ad02fe20af18cc35526760fbad (diff)
parent5f9674243d0341519e5031681c941b0e1ad7a9e3 (diff)
downloadgit-6cddb7362ca3c7312b57a4f172bca5c953a45b6c.zip
git-6cddb7362ca3c7312b57a4f172bca5c953a45b6c.tar.gz
git-6cddb7362ca3c7312b57a4f172bca5c953a45b6c.tar.bz2
Merge branch 'hm/config-parse-expiry-date'
"git config --expiry-date gc.reflogexpire" can read "2.weeks" from the configuration and report it as a timestamp, just like "--int" would read "1k" and report 1024, to help consumption by scripts. * hm/config-parse-expiry-date: config: add --expiry-date
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-config.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 4edd09f..14da5fc 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -180,6 +180,11 @@ See also <<FILES>>.
value (but you can use `git config section.variable ~/`
from the command line to let your shell do the expansion).
+--expiry-date::
+ `git config` will ensure that the output is converted from
+ a fixed or relative date-string to a timestamp. This option
+ has no effect when setting the value.
+
-z::
--null::
For all options that output values and/or keys, always