Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | config: use chmod() instead of fchmod()kb/avoid-fchmod-for-now | Karsten Blees | 2014-07-16 | 1 | -4/+4 | |
* | | | | | | | refactor skip_prefix to return a boolean | Jeff King | 2014-06-20 | 1 | -2/+1 | |
* | | | | | | | Merge branch 'ow/config-mailmap-pathname' | Junio C Hamano | 2014-06-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | config: respect '~' and '~user' in mailmap.fileow/config-mailmap-pathname | Ø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 functionjk/strbuf-tolower | 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 selectionnd/status-auto-comment-char | 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 editsew/config-protect-mode | 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 NORETURNjk/config-die-bad-number-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 inputks/config-file-stdin | Kirill A. Shutemov | 2014-02-18 | 1 | -14/+27 | |
| * | | | | config: change git_config_with_options() interface | Kirill A. Shutemov | 2014-02-18 | 1 | -7/+6 | |
| * | | | | config: disallow relative include paths from blobs | Jeff King | 2014-02-18 | 1 | -4/+6 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'jc/core-checkstat-2.0' | Junio C Hamano | 2014-03-07 | 1 | -14/+1 | |
|\ \ \ \ |