Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rr/revert-cherry-pick-continue' | Junio C Hamano | 2011-10-05 | 1 | -9/+27 |
|\ | |||||
| * | config: Introduce functions to write non-standard file | Ramkumar Ramachandra | 2011-08-04 | 1 | -9/+27 |
* | | Merge branch 'jc/pack-order-tweak' | Junio C Hamano | 2011-08-05 | 1 | -0/+3 |
|\ \ | |||||
| * | | core: log offset pack data accesses happened | Junio C Hamano | 2011-07-06 | 1 | -0/+3 |
| |/ | |||||
* | | Merge branch 'maint' | Junio C Hamano | 2011-07-22 | 1 | -2/+2 |
|\ \ | |||||
| * | | git-config: Remove extra whitespaces | Pavan Kumar Sunkara | 2011-07-19 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'jk/clone-cmdline-config' | Junio C Hamano | 2011-07-19 | 1 | -2/+2 |
|\ \ | |||||
| * | | config: make git_config_parse_parameter a public function | Jeff King | 2011-06-22 | 1 | -2/+2 |
* | | | Merge branch 'jk/maint-config-param' | Junio C Hamano | 2011-07-19 | 1 | -4/+4 |
|\ \ \ | |/ / | |||||
| * | | config: use strbuf_split_str instead of a temporary strbuf | Jeff King | 2011-06-22 | 1 | -3/+1 |
| * | | config: avoid segfault when parsing command-line config | Jeff King | 2011-06-22 | 1 | -0/+2 |
| * | | config: die on error in command-line config | Jeff King | 2011-06-22 | 1 | -1/+1 |
| * | | fix "git -c" parsing of values with equals signs | Jeff King | 2011-06-22 | 1 | -1/+1 |
| * | | Merge branch 'jk/maint-config-alias-fix' into maint | Junio C Hamano | 2011-06-01 | 1 | -42/+21 |
| |\ \ | |||||
| * \ \ | Merge branch 'jc/pack-objects-bigfile' into maint | Junio C Hamano | 2011-05-04 | 1 | -0/+6 |
| |\ \ \ | |||||
* | | | | | config.c: Make git_config() work correctly when called recursively | Ramsay Jones | 2011-06-16 | 1 | -30/+50 |
| |_|_|/ |/| | | | |||||
* | | | | config.c: Remove unused git_config_global() function | Ramsay Jones | 2011-05-31 | 1 | -5/+0 |
* | | | | Merge branch 'jk/maint-config-alias-fix' | Junio C Hamano | 2011-05-30 | 1 | -39/+23 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | config: always parse GIT_CONFIG_PARAMETERS during git_config | Jeff King | 2011-05-24 | 1 | -40/+11 |
| * | | | git_config: don't peek at global config_parameters | Jeff King | 2011-05-24 | 1 | -4/+11 |
| * | | | config: make environment parsing routines static | Jeff King | 2011-05-24 | 1 | -2/+2 |
* | | | | config: define and document exit codes | Michael J Gruber | 2011-05-17 | 1 | -10/+10 |
* | | | | convert: rename the "eol" global variable to "core_eol" | Junio C Hamano | 2011-05-09 | 1 | -6/+6 |
* | | | | Merge branch 'ef/maint-strbuf-init' | Junio C Hamano | 2011-04-27 | 1 | -10/+8 |
|\ \ \ \ | |||||
| * | | | | config: support values longer than 1023 bytes | Erik Faye-Lund | 2011-04-11 | 1 | -10/+8 |
* | | | | | Merge branch 'jc/pack-objects-bigfile' | Junio C Hamano | 2011-04-27 | 1 | -0/+6 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Teach core.bigfilethreashold to pack-objects | Junio C Hamano | 2011-04-05 | 1 | -0/+6 |
* | | | | Merge branch 'lt/default-abbrev' | Junio C Hamano | 2011-03-23 | 1 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | Rename core.abbrevlength back to core.abbrev | Junio C Hamano | 2011-03-20 | 1 | -1/+1 |
| * | | | | Make the default abbrev length configurable | Linus Torvalds | 2011-03-11 | 1 | -0/+8 |
| |/ / / | |||||
* | | | | Merge branch 'jn/test-sanitize-git-env' | Junio C Hamano | 2011-03-22 | 1 | -6/+1 |
|\ \ \ \ | |||||
| * | | | | config: drop support for GIT_CONFIG_NOGLOBAL | Jonathan Nieder | 2011-03-15 | 1 | -6/+1 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2011-03-16 | 1 | -2/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge branch 'jh/push-default-upstream-configname' into maint | Junio C Hamano | 2011-03-16 | 1 | -2/+4 |
| |\ \ \ \ | |||||
| * | | | | | standardize brace placement in struct definitions | Jonathan Nieder | 2011-03-16 | 1 | -2/+1 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-03-10 | 1 | -7/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer" | Junio C Hamano | 2011-03-10 | 1 | -7/+0 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jh/push-default-upstream-configname' | Junio C Hamano | 2011-02-27 | 1 | -2/+4 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | push.default: Rename 'tracking' to 'upstream' | Johan Herland | 2011-02-16 | 1 | -2/+4 |
| |/ / / | |||||
* | | | | Disallow empty section and variable names | Libor Pechacek | 2011-02-22 | 1 | -1/+6 |
* | | | | Sanity-check config variable names | Libor Pechacek | 2011-02-22 | 1 | -39/+67 |
|/ / / | |||||
* | | | Merge branch 'nd/setup' | Junio C Hamano | 2010-12-28 | 1 | -5/+14 |
|\ \ \ | | |/ | |/| | |||||
| * | | Add git_config_early() | Nguyễn Thái Ngọc Duy | 2010-12-22 | 1 | -5/+14 |
* | | | Merge branch 'jk/maint-decorate-01-bool' | Junio C Hamano | 2010-12-21 | 1 | -5/+3 |
|\ \ \ | |||||
| * | | | handle arbitrary ints in git_config_maybe_bool | Jeff King | 2010-12-19 | 1 | -5/+3 |
* | | | | Merge branch 'jk/maint-decorate-01-bool' | Junio C Hamano | 2010-12-08 | 1 | -2/+14 |
|\ \ \ \ | |/ / / | |||||
| * | | | log.decorate: accept 0/1 bool values | Jeff King | 2010-11-17 | 1 | -2/+14 |
| |/ / | |||||
* | | | Merge branch 'jc/abbrev-guard' | Junio C Hamano | 2010-12-03 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | core.abbrevguard: Ensure short object names stay unique a bit longer | Junio C Hamano | 2010-10-28 | 1 | -0/+7 |
| |/ / | |||||
* | | | config: treat non-existent config files as empty | Jeff King | 2010-10-21 | 1 | -3/+1 |
|/ / |