diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-03-08 09:34:13 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-03-08 09:34:13 +0300 |
commit | 934f788981de941814e821217f32451a5c715d5d (patch) | |
tree | b98d42ef8c9606b34f9b9389d2d65190db1ecc37 /Documentation/git-config.txt | |
parent | 113106e06c48cc80432fd1be8af912898e8f240e (diff) | |
parent | 9a6682bab5e800465f0a4e44cdf18fe396ff4f6d (diff) |
Merge branch 'maint'
* maint:
builtin-revert.c: release index lock when cherry-picking an empty commit
document config --bool-or-int
t1300: use test_must_fail as appropriate
cleanup: add isascii()
Documentation: fix badly indented paragraphs in "--bisect-all" description
Diffstat (limited to 'Documentation/git-config.txt')
-rw-r--r-- | Documentation/git-config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 7d140073b1..82ce89eae8 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -131,6 +131,10 @@ See also <<FILES>>. in the config file will cause the value to be multiplied by 1024, 1048576, or 1073741824 prior to output. +--bool-or-int:: + 'git-config' will ensure that the output matches the format of + either --bool or --int, as described above. + -z:: --null:: For all options that output values and/or keys, always |