aboutsummaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAge
* Merge branch 'mh/lockfile'Junio C Hamano2014-10-14
|\
| * lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty2014-10-01
| * lockfile: change lock_file::filename into a strbufMichael Haggerty2014-10-01
| * git_config_set_multivar_in_file(): avoid call to rollback_lock_file()Michael Haggerty2014-10-01
* | Merge branch 'sp/stream-clean-filter'Junio C Hamano2014-10-08
|\ \ | |/ |/|
| * config.c: add git_env_ulong() to parse environment variableSteffen Prohaska2014-08-28
* | Merge branch 'ta/config-add-to-empty-or-true-fix'Junio C Hamano2014-09-19
|\ \
| * | config: avoid a funny sentinel value "a^"Jeff King2014-09-11
| * | make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-18
| * | Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano2014-07-22
| |\ \
| * \ \ Merge branch 'ow/config-mailmap-pathname' into maintJunio C Hamano2014-06-25
| |\ \ \
* | \ \ \ Merge branch 'rs/simplify-config-include'Junio C Hamano2014-09-19
|\ \ \ \ \
| * | | | | config: simplify git_config_include()René Scharfe2014-09-02
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ta/config-set-1'Junio C Hamano2014-09-11
|\ \ \ \ \
| * | | | | rewrite git_config() to use the config-set APITanay Abhra2014-08-07
| * | | | | config: add `git_die_config()` to the config-set APITanay Abhra2014-08-07
| * | | | | change `git_config()` return value to voidTanay Abhra2014-08-07
| * | | | | add line number and file name info to `config_set`Tanay Abhra2014-08-07
| * | | | | config.c: fix accuracy of line number in errorsMatthieu Moy2014-08-07
| * | | | | config.c: mark error and warnings strings for translationMatthieu Moy2014-08-07
* | | | | | Merge branch 'jk/command-line-config-empty-string'Junio C Hamano2014-09-09
|\ \ \ \ \ \
| * | | | | | config: teach "git -c" to recognize an empty stringJunio C Hamano2014-08-05
* | | | | | | Merge branch 'ta/config-set'Junio C Hamano2014-09-02
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | |
| * | | | | add `config_set` API for caching config-like filesTanay Abhra2014-07-29
* | | | | | Merge branch 'jk/misc-fixes-maint'Junio C Hamano2014-07-28
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix memory leak parsing core.commentcharJeff King2014-07-24
| | |/ / / | |/| | |
* | | | | Merge branch 'kb/avoid-fchmod-for-now'Junio C Hamano2014-07-21
|\ \ \ \ \
| * | | | | config: use chmod() instead of fchmod()Karsten Blees2014-07-16
* | | | | | refactor skip_prefix to return a booleanJeff King2014-06-20
* | | | | | Merge branch 'ow/config-mailmap-pathname'Junio C Hamano2014-06-16
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | config: respect '~' and '~user' in mailmap.fileØystein Walle2014-05-27
* | | | | | Merge branch 'bg/xcalloc-nmemb-then-size'Junio C Hamano2014-06-16
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | config.c: rearrange xcalloc argumentsBrian Gesiak2014-05-27
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/strbuf-tolower'Junio C Hamano2014-06-16
|\ \ \ \ \
| * | | | | strbuf: add strbuf_tolower functionJeff King2014-05-23
| |/ / / /
* | | | | Merge branch 'nd/status-auto-comment-char'Junio C Hamano2014-06-06
|\ \ \ \ \
| * | | | | commit: allow core.commentChar=auto for character auto selectionNguyễn Thái Ngọc Duy2014-05-19
| * | | | | config: be strict on core.commentCharNguyễn Thái Ngọc Duy2014-05-19
| |/ / / /
* | | | | Merge branch 'ew/config-protect-mode'Junio C Hamano2014-06-03
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | config: preserve config file permissions on editsEric Wong2014-05-06
| |/ /
| * | Merge branch 'jk/config-path-include-fix' into maintJunio C Hamano2014-03-18
| |\ \
* | \ \ Merge branch 'jk/config-die-bad-number-noreturn'Junio C Hamano2014-04-18
|\ \ \ \
| * | | | config.c: mark die_bad_number as NORETURNJeff King2014-04-16
| | |_|/ | |/| |
* | | | Merge branch 'ks/config-file-stdin'Junio C Hamano2014-03-14
|\ \ \ \
| * | | | config: teach "git config --file -" to read from the standard inputKirill A. Shutemov2014-02-18
| * | | | config: change git_config_with_options() interfaceKirill A. Shutemov2014-02-18
| * | | | config: disallow relative include paths from blobsJeff King2014-02-18
| | |/ / | |/| |
* | | | Merge branch 'jc/core-checkstat-2.0'Junio C Hamano2014-03-07
|\ \ \ \
| * | | | core.statinfo: remove as promised in Git 2.0Junio C Hamano2013-05-06
* | | | | Merge branch 'jk/config-path-include-fix'Junio C Hamano2014-02-27
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |