Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pc/occurred' into maint | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
|\ | |||||
| * | config.c: fix misspelt "occurred" in an error messagepc/occurred | Peter Colberg | 2016-06-10 | 1 | -1/+1 |
| * | Merge branch 'tb/core-eol-fix' into maint | Junio C Hamano | 2016-06-06 | 1 | -4/+0 |
| |\ | |||||
| * \ | Merge branch 'js/windows-dotgit' into maint | Junio C Hamano | 2016-05-26 | 1 | -0/+8 |
| |\ \ | |||||
| * \ \ | Merge branch 'sb/misc-cleanups' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -4/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/do-not-printf-NULL' into maint | Junio C Hamano | 2016-05-02 | 1 | -7/+11 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'tb/core-eol-fix' | Junio C Hamano | 2016-05-23 | 1 | -4/+0 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | convert: allow core.autocrlf=input and core.eol=crlf | Torsten Bögershausen | 2016-04-25 | 1 | -4/+0 |
* | | | | | | Merge branch 'js/windows-dotgit' | Junio C Hamano | 2016-05-17 | 1 | -0/+8 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | mingw: introduce the 'core.hideDotFiles' setting | Johannes Schindelin | 2016-05-11 | 1 | -0/+8 |
| |/ / / / | |||||
* | | | | | Merge branch 'nd/error-errno' | Junio C Hamano | 2016-05-17 | 1 | -13/+9 |
|\ \ \ \ \ | |||||
| * | | | | | config.c: use error_errno() | Nguyễn Thái Ngọc Duy | 2016-05-09 | 1 | -13/+9 |
| |/ / / / | |||||
* | | | | | Merge branch 'ab/hooks' | Junio C Hamano | 2016-05-17 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | hooks: allow customizing where the hook directory is | Ævar Arnfjörð Bjarmason | 2016-05-04 | 1 | -0/+3 |
| |/ / / / | |||||
* | | | | | Merge branch 'sb/misc-cleanups' | Junio C Hamano | 2016-05-10 | 1 | -4/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | config.c: drop local variable | Stefan Beller | 2016-04-28 | 1 | -4/+1 |
| * | | | | Merge branch 'jk/tighten-alloc' into maint | Junio C Hamano | 2016-03-10 | 1 | -3/+1 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'jk/do-not-printf-NULL' | Junio C Hamano | 2016-04-22 | 1 | -7/+11 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | git_config_set_multivar_in_file: handle "unset" errorsjk/do-not-printf-NULL | Jeff King | 2016-04-10 | 1 | -2/+6 |
| * | | | | | git_config_set_multivar_in_file: all non-zero returns are errors | Jeff King | 2016-04-10 | 1 | -1/+1 |
| * | | | | | config: lower-case first word of error strings | Jeff King | 2016-04-10 | 1 | -5/+5 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jk/check-repository-format' | Junio C Hamano | 2016-04-13 | 1 | -8/+4 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | config: drop git_config_early | Jeff King | 2016-03-11 | 1 | -8/+4 |
| |/ / / | |||||
* | | | | Merge branch 'jk/submodule-c-credential' | Junio C Hamano | 2016-04-06 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS | Jeff King | 2016-03-23 | 1 | -1/+1 |
* | | | | Merge branch 'ps/config-error' | Junio C Hamano | 2016-02-26 | 1 | -12/+40 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | config: rename git_config_set_or_die to git_config_setps/config-error | Patrick Steinhardt | 2016-02-22 | 1 | -12/+12 |
| * | | | config: rename git_config_set to git_config_set_gently | Patrick Steinhardt | 2016-02-22 | 1 | -14/+15 |
| * | | | config: introduce set_or_die wrappers | Patrick Steinhardt | 2016-02-16 | 1 | -0/+27 |
* | | | | Merge branch 'ls/config-origin' | Junio C Hamano | 2016-02-26 | 1 | -11/+25 |
|\ \ \ \ | |||||
| * | | | | config: add 'origin_type' to config_source struct | Lars Schneider | 2016-02-22 | 1 | -11/+25 |
| * | | | | rename git_config_from_buf to git_config_from_mem | Lars Schneider | 2016-02-19 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge branch 'jk/tighten-alloc' | Junio C Hamano | 2016-02-26 | 1 | -3/+1 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| * | | use xmallocz to avoid size arithmetic | Jeff King | 2016-02-22 | 1 | -3/+1 |
| |/ | |||||
* | | test-dump-untracked-cache: don't modify the untracked cache | Christian Couder | 2016-01-27 | 1 | -0/+4 |
* | | config: add core.untrackedCache | Christian Couder | 2016-01-27 | 1 | -0/+20 |
|/ | |||||
* | Make error message after failing commit_lock_file() less confusing | SZEDER Gábor | 2015-12-01 | 1 | -2/+4 |
* | Merge branch 'db/push-sign-if-asked' | Junio C Hamano | 2015-08-31 | 1 | -3/+3 |
|\ | |||||
| * | config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_... | Dave Borowitz | 2015-08-19 | 1 | -3/+3 |
* | | Merge branch 'jk/fix-alias-pager-config-key-warnings' | Junio C Hamano | 2015-08-31 | 1 | -10/+29 |
|\ \ | |||||
| * | | config: silence warnings for command names with invalid keysjk/fix-alias-pager-config-key-warnings | Jeff King | 2015-08-24 | 1 | -10/+29 |
* | | | Merge branch 'ss/fix-config-fd-leak' | Junio C Hamano | 2015-08-26 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | config: close config file handle in case of errorss/fix-config-fd-leak | Sven Strickroth | 2015-08-14 | 1 | -1/+4 |
* | | | | Merge branch 'mh/tempfile' | Junio C Hamano | 2015-08-25 | 1 | -7/+7 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | lockfile: add accessor get_lock_file_path() | Michael Haggerty | 2015-08-10 | 1 | -7/+7 |
* | | | | Merge branch 'kb/config-unmap-before-renaming' | Junio C Hamano | 2015-07-13 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | config.c: fix writing config files on Windows network shareskb/config-unmap-before-renaming | Karsten Blees | 2015-06-30 | 1 | -0/+3 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'jk/diagnose-config-mmap-failure' into maint | Junio C Hamano | 2015-06-25 | 1 | -6/+16 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'pt/xdg-config-path' into maint | Junio C Hamano | 2015-06-05 | 1 | -4/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'cn/bom-in-gitignore' into maint | Junio C Hamano | 2015-05-13 | 1 | -3/+3 |
| |\ \ \ \ \ |