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