Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'jk/diagnose-config-mmap-failure' | Junio C Hamano | 2015-06-11 | 1 | -6/+16 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | config.c: rewrite ENODEV into EISDIR when mmap fails | Jeff King | 2015-05-28 | 1 | -0/+2 |
| * | | | | | config.c: avoid xmmap error messages | Jeff King | 2015-05-28 | 1 | -2/+9 |
| * | | | | | config.c: fix mmap leak when writing config | Jeff King | 2015-05-28 | 1 | -4/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'pt/xdg-config-path' | Junio C Hamano | 2015-05-11 | 1 | -4/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | git-config: replace use of home_config_paths() | Paul Tan | 2015-05-06 | 1 | -4/+2 |
* | | | | | Merge branch 'jk/reading-packed-refs' | Junio C Hamano | 2015-05-11 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | config: use getc_unlocked when reading from file | Jeff King | 2015-04-16 | 1 | -1/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'cn/bom-in-gitignore' | Junio C Hamano | 2015-05-05 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | config: use utf8_bom[] from utf.[ch] in git_parse_source() | Junio C Hamano | 2015-04-16 | 1 | -3/+3 |
| | |/ | |/| | |||||
| * | | Merge branch 'rs/maint-config-use-labs' into maint | Junio C Hamano | 2014-12-22 | 1 | -2/+2 |
| |\ \ | |||||
* | \ \ | Merge branch 'jk/config-no-ungetc-eof' | Junio C Hamano | 2015-02-18 | 1 | -3/+8 |
|\ \ \ \ | |||||
| * | | | | config_buf_ungetc: warn when pushing back a random characterjk/config-no-ungetc-eof | Jeff King | 2015-02-05 | 1 | -2/+6 |
| * | | | | config: do not ungetc EOF | Jeff King | 2015-02-05 | 1 | -1/+2 |
* | | | | | Merge branch 'jk/blame-commit-label' | Junio C Hamano | 2015-02-11 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | use xstrdup_or_null to replace ternary conditionals | Jeff King | 2015-01-13 | 1 | -1/+1 |
* | | | | | Sync with v2.2.1 | Junio C Hamano | 2014-12-18 | 1 | -0/+10 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Sync with v2.1.4 | Junio C Hamano | 2014-12-17 | 1 | -0/+10 |
| |\ \ \ \ | |||||
| | * \ \ \ | Sync with v2.0.5 | Junio C Hamano | 2014-12-17 | 1 | -0/+10 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Sync with v1.9.5 | Junio C Hamano | 2014-12-17 | 1 | -0/+10 |
| | | |\ \ \ | |||||
| | | | * \ \ | Sync with v1.8.5.6 | Junio C Hamano | 2014-12-17 | 1 | -0/+10 |
| | | | |\ \ \ | |||||
| | | | | * | | | read-cache: optionally disallow NTFS .git variants | Johannes Schindelin | 2014-12-17 | 1 | -0/+5 |
| | | | | * | | | read-cache: optionally disallow HFS+ .git variants | Jeff King | 2014-12-17 | 1 | -0/+5 |
* | | | | | | | | Merge branch 'rs/maint-config-use-labs' | Junio C Hamano | 2014-12-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | use labs() for variables of type long instead of abs()rs/maint-config-use-labs | René Scharfe | 2014-11-17 | 1 | -2/+2 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'ta/config-add-to-empty-or-true-fix' into maint | Junio C Hamano | 2014-09-29 | 1 | -6/+17 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/command-line-config-empty-string' into maint | Junio C Hamano | 2014-09-19 | 1 | -2/+10 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'mh/lockfile' | Junio C Hamano | 2014-10-14 | 1 | -7/+9 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfile | Michael Haggerty | 2014-10-01 | 1 | -0/+1 |
| * | | | | | | | lockfile: change lock_file::filename into a strbuf | Michael Haggerty | 2014-10-01 | 1 | -7/+7 |
| * | | | | | | | git_config_set_multivar_in_file(): avoid call to rollback_lock_file() | Michael Haggerty | 2014-10-01 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'sp/stream-clean-filter' | Junio C Hamano | 2014-10-08 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | config.c: add git_env_ulong() to parse environment variable | Steffen Prohaska | 2014-08-28 | 1 | -0/+16 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ta/config-add-to-empty-or-true-fix' | Junio C Hamano | 2014-09-19 | 1 | -6/+17 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | config: avoid a funny sentinel value "a^"ta/config-add-to-empty-or-true-fix | Jeff King | 2014-09-11 | 1 | -6/+17 |
| * | | | | | | make config --add behave correctly for empty and NULL values | Tanay Abhra | 2014-08-18 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'bg/xcalloc-nmemb-then-size' into maint | Junio C Hamano | 2014-07-22 | 1 | -2/+2 |
| |\ \ \ \ \ |