Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ow/config-mailmap-pathname' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'rs/simplify-config-include' | Junio C Hamano | 2014-09-19 | 1 | -5/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: simplify git_config_include()rs/simplify-config-include | René Scharfe | 2014-09-02 | 1 | -5/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ta/config-set-1' | Junio C Hamano | 2014-09-11 | 1 | -24/+128 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rewrite git_config() to use the config-set API | Tanay Abhra | 2014-08-07 | 1 | -8/+43 |
| * | | | | | | | | config: add `git_die_config()` to the config-set API | Tanay Abhra | 2014-08-07 | 1 | -2/+37 |
| * | | | | | | | | change `git_config()` return value to void | Tanay Abhra | 2014-08-07 | 1 | -2/+14 |
| * | | | | | | | | add line number and file name info to `config_set` | Tanay Abhra | 2014-08-07 | 1 | -2/+14 |
| * | | | | | | | | config.c: fix accuracy of line number in errors | Matthieu Moy | 2014-08-07 | 1 | -1/+11 |
| * | | | | | | | | config.c: mark error and warnings strings for translation | Matthieu Moy | 2014-08-07 | 1 | -10/+10 |
* | | | | | | | | | Merge branch 'jk/command-line-config-empty-string' | Junio C Hamano | 2014-09-09 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | config: teach "git -c" to recognize an empty stringjk/command-line-config-empty-string | Junio C Hamano | 2014-08-05 | 1 | -2/+10 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ta/config-set' | Junio C Hamano | 2014-09-02 | 1 | -0/+274 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | add `config_set` API for caching config-like files | Tanay Abhra | 2014-07-29 | 1 | -0/+274 |
* | | | | | | | Merge branch 'jk/misc-fixes-maint' | Junio C Hamano | 2014-07-28 | 1 | -7/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | fix memory leak parsing core.commentchar | Jeff King | 2014-07-24 | 1 | -5/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'kb/avoid-fchmod-for-now' | Junio C Hamano | 2014-07-21 | 1 | -4/+4 |
|\ \ \ \ \ \ |