Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ow/config-mailmap-pathname' | Junio C Hamano | 2014-06-16 | 1 | -1/+1 |
|\ | |||||
| * | config: respect '~' and '~user' in mailmap.file | Øystein Walle | 2014-05-27 | 1 | -1/+1 |
* | | Merge branch 'bg/xcalloc-nmemb-then-size' | Junio C Hamano | 2014-06-16 | 1 | -2/+2 |
|\ \ | |||||
| * | | config.c: rearrange xcalloc arguments | Brian Gesiak | 2014-05-27 | 1 | -2/+2 |
* | | | Merge branch 'jk/strbuf-tolower' | Junio C Hamano | 2014-06-16 | 1 | -7/+1 |
|\ \ \ | |||||
| * | | | strbuf: add strbuf_tolower function | Jeff King | 2014-05-23 | 1 | -7/+1 |
| |/ / | |||||
* | | | Merge branch 'nd/status-auto-comment-char' | Junio C Hamano | 2014-06-06 | 1 | -2/+9 |
|\ \ \ | |||||
| * | | | commit: allow core.commentChar=auto for character auto selection | Nguyễn Thái Ngọc Duy | 2014-05-19 | 1 | -0/+3 |
| * | | | config: be strict on core.commentChar | Nguyễn Thái Ngọc Duy | 2014-05-19 | 1 | -2/+6 |
| |/ / | |||||
* | | | Merge branch 'ew/config-protect-mode' | Junio C Hamano | 2014-06-03 | 1 | -0/+16 |
|\ \ \ | |/ / |/| | | |||||
| * | | config: preserve config file permissions on edits | Eric Wong | 2014-05-06 | 1 | -0/+16 |
| |/ | |||||
| * | Merge branch 'jk/config-path-include-fix' into maint | Junio C Hamano | 2014-03-18 | 1 | -1/+5 |
| |\ | |||||
* | \ | Merge branch 'jk/config-die-bad-number-noreturn' | Junio C Hamano | 2014-04-18 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | config.c: mark die_bad_number as NORETURN | Jeff King | 2014-04-16 | 1 | -0/+1 |
* | | | | Merge branch 'ks/config-file-stdin' | Junio C Hamano | 2014-03-14 | 1 | -23/+37 |
|\ \ \ \ | |||||
| * | | | | config: teach "git config --file -" to read from the standard input | Kirill A. Shutemov | 2014-02-19 | 1 | -14/+27 |
| * | | | | config: change git_config_with_options() interface | Kirill A. Shutemov | 2014-02-19 | 1 | -7/+6 |
| * | | | | config: disallow relative include paths from blobs | Jeff King | 2014-02-19 | 1 | -4/+6 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jc/core-checkstat-2.0' | Junio C Hamano | 2014-03-08 | 1 | -14/+1 |
|\ \ \ \ | |||||
| * | | | | core.statinfo: remove as promised in Git 2.0 | Junio C Hamano | 2013-05-07 | 1 | -14/+1 |
* | | | | | Merge branch 'jk/config-path-include-fix' | Junio C Hamano | 2014-02-27 | 1 | -1/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | handle_path_include: don't look at NULL value | Jeff King | 2014-01-28 | 1 | -1/+5 |
* | | | | Merge branch 'cc/starts-n-ends-with' | Junio C Hamano | 2013-12-17 | 1 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | replace {pre,suf}fixcmp() with {starts,ends}_with() | Christian Couder | 2013-12-05 | 1 | -8/+8 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'tr/config-multivalue-lift-max' | Junio C Hamano | 2013-12-12 | 1 | -6/+13 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | config: arbitrary number of matches for --unset and --replace-all | Thomas Rast | 2013-12-06 | 1 | -6/+13 |
| * | | | Merge branch 'hv/config-from-blob' into maint | Junio C Hamano | 2013-09-05 | 1 | -16/+16 |
| |\ \ \ | |||||
* | | | | | config.c: mark file-local function static | Ramsay Jones | 2013-10-15 | 1 | -1/+1 |
* | | | | | Merge branch 'jk/config-int-range-check' | Junio C Hamano | 2013-09-12 | 1 | -17/+67 |
|\ \ \ \ \ | |||||
| * | | | | | git-config: always treat --int as 64-bit internally | Jeff King | 2013-09-09 | 1 | -0/+17 |
| * | | | | | config: make numeric parsing errors more clear | Jeff King | 2013-09-09 | 1 | -5/+12 |
| * | | | | | config: set errno in numeric git_parse_* functions | Jeff King | 2013-09-09 | 1 | -4/+14 |
| * | | | | | config: properly range-check integer values | Jeff King | 2013-09-09 | 1 | -6/+6 |
| * | | | | | config: factor out integer parsing from range checks | Jeff King | 2013-09-09 | 1 | -6/+22 |
| |/ / / / | |||||
* | | | | | Merge branch 'hv/config-from-blob' | Junio C Hamano | 2013-08-30 | 1 | -16/+16 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | config: do not use C function names as struct members | Jeff King | 2013-08-27 | 1 | -16/+16 |
* | | | | Merge branch 'hv/config-from-blob' | Junio C Hamano | 2013-07-22 | 1 | -48/+169 |
|\| | | | |||||
| * | | | do not die when error in config parsing of buf occurs | Heiko Voigt | 2013-07-12 | 1 | -2/+8 |
| * | | | teach config --blob option to parse config from database | Heiko Voigt | 2013-07-12 | 1 | -2/+84 |
| * | | | config: make parsing stack struct independent from actual data source | Heiko Voigt | 2013-07-12 | 1 | -21/+43 |
| * | | | config: drop cf validity check in get_next_char() | Heiko Voigt | 2013-07-12 | 1 | -16/+13 |
| * | | | config: factor out config file stack management | Heiko Voigt | 2013-07-12 | 1 | -14/+28 |
* | | | | Merge branch 'nd/traces' | Junio C Hamano | 2013-06-21 | 1 | -3/+0 |
|\ \ \ \ | |||||
| * | | | | core: use env variable instead of config var to turn on logging pack access | Nguyễn Thái Ngọc Duy | 2013-06-10 | 1 | -3/+0 |
| |/ / / | |||||
* | | | | Merge branch 'jc/core-checkstat' | Junio C Hamano | 2013-06-05 | 1 | -1/+14 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | deprecate core.statinfo at Git 2.0 boundary | Junio C Hamano | 2013-05-07 | 1 | -1/+14 |
| |/ / | |||||
* / / | config: allow inaccessible configuration under $HOME | Jonathan Nieder | 2013-04-15 | 1 | -5/+5 |
|/ / | |||||
* | | Merge branch 'jk/config-parsing-cleanup' | Junio C Hamano | 2013-02-04 | 1 | -0/+33 |
|\ \ | |||||
| * | | config: add helper function for parsing key names | Jeff King | 2013-01-23 | 1 | -0/+33 |
* | | | Merge branch 'jc/custom-comment-char' | Junio C Hamano | 2013-02-04 | 1 | -0/+8 |
|\ \ \ |