Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'jt/commit-graph-per-object-store' | Junio C Hamano | 2018-08-02 | 1 | -5/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | commit-graph: add repo arg to graph readers | Jonathan Tan | 2018-07-17 | 1 | -5/+0 | |
| * | | | | | Merge branch 'sb/object-store-grafts' into sb/object-store-lookup | Junio C Hamano | 2018-06-29 | 1 | -0/+1 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge branch 'jk/fsck-gitmodules-gently' | Junio C Hamano | 2018-08-02 | 1 | -9/+23 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | config: add options parameter to git_config_from_mem | Jeff King | 2018-07-03 | 1 | -4/+7 | |
| * | | | | | config: add CONFIG_ERROR_SILENT handler | Jeff King | 2018-07-03 | 1 | -0/+3 | |
| * | | | | | config: turn die_on_error into caller-facing enum | Jeff King | 2018-07-03 | 1 | -5/+13 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'ao/config-from-gitmodules' | Junio C Hamano | 2018-07-18 | 1 | -17/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | config: move config_from_gitmodules to submodule-config.c | Antonio Ospite | 2018-06-26 | 1 | -17/+0 | |
* | | | | | | Merge branch 'sb/object-store-grafts' | Junio C Hamano | 2018-07-18 | 1 | -0/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | ||||||
| * | | | | object-store: move object access functions to object-store.h | Stefan Beller | 2018-05-16 | 1 | -0/+1 | |
* | | | | | Merge branch 'as/safecrlf-quiet-fix' | Junio C Hamano | 2018-06-28 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | config.c: fix regression for core.safecrlf false | Anthony Sottile | 2018-06-11 | 1 | -1/+1 | |
* | | | | | Merge branch 'nd/complete-config-vars' | Junio C Hamano | 2018-06-25 | 1 | -0/+13 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Add and use generic name->id mapping code for color slot parsing | Nguyễn Thái Ngọc Duy | 2018-05-29 | 1 | -0/+13 | |
* | | | | | Merge branch 'ma/config-store-data-clear' | Junio C Hamano | 2018-05-30 | 1 | -18/+18 | |
|\ \ \ \ \ | ||||||
| * | | | | | config: let `config_store_data_clear()` handle `key` | Martin Ågren | 2018-05-21 | 1 | -7/+3 | |
| * | | | | | config: let `config_store_data_clear()` handle `value_regex` | Martin Ågren | 2018-05-21 | 1 | -11/+6 | |
| * | | | | | config: free resources of `struct config_store_data` | Martin Ågren | 2018-05-21 | 1 | -0/+9 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'js/empty-config-section-fix' | Junio C Hamano | 2018-05-30 | 1 | -1/+1 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | config: a user-provided invalid section is not a BUG | Johannes Schindelin | 2018-05-18 | 1 | -1/+1 | |
* | | | | | Merge branch 'js/use-bug-macro' | Junio C Hamano | 2018-05-30 | 1 | -6/+6 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Replace all die("BUG: ...") calls by BUG() ones | Johannes Schindelin | 2018-05-06 | 1 | -6/+6 | |
* | | | | | Merge branch 'js/colored-push-errors' | Junio C Hamano | 2018-05-08 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | push: colorize errors | Ryan Dammrose | 2018-04-24 | 1 | -1/+1 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'tb/config-default' | Junio C Hamano | 2018-05-08 | 1 | -0/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | config.c: introduce 'git_config_color' to parse ANSI colors | Taylor Blau | 2018-04-23 | 1 | -0/+10 | |
* | | | | | | Merge branch 'ls/checkout-encoding' | Junio C Hamano | 2018-05-08 | 1 | -0/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | convert: add round trip check based on 'core.checkRoundtripEncoding' | Lars Schneider | 2018-04-16 | 1 | -0/+5 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge branch 'ds/commit-graph' | Junio C Hamano | 2018-05-08 | 1 | -0/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | commit-graph: add core.commitGraph setting | Derrick Stolee | 2018-04-11 | 1 | -0/+5 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge branch 'js/empty-config-section-fix' | Junio C Hamano | 2018-05-08 | 1 | -133/+315 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | ||||||
| * | | | | git_config_set: reuse empty sections | Johannes Schindelin | 2018-04-09 | 1 | -1/+13 | |
| * | | | | git config --unset: remove empty sections (in the common case) | Johannes Schindelin | 2018-04-09 | 1 | -2/+91 | |
| * | | | | git_config_set: make use of the config parser's event stream | Johannes Schindelin | 2018-04-09 | 1 | -89/+81 | |
| * | | | | git_config_set: do not use a state machine | Johannes Schindelin | 2018-04-09 | 1 | -30/+29 | |
| * | | | | config_set_store: rename some fields for consistency | Johannes Schindelin | 2018-04-09 | 1 | -32/+31 | |
| * | | | | config: avoid using the global variable `store` | Johannes Schindelin | 2018-04-09 | 1 | -53/+66 | |
| * | | | | config: introduce an optional event stream while parsing | Johannes Schindelin | 2018-04-09 | 1 | -12/+89 | |
| * | | | | config --replace-all: avoid extra line breaks | Johannes Schindelin | 2018-04-06 | 1 | -0/+1 | |
| * | | | | git_config_set: fix off-by-two | Johannes Schindelin | 2018-04-06 | 1 | -1/+1 | |
* | | | | | Merge branch 'sb/filenames-with-dashes' | Junio C Hamano | 2018-04-25 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | exec_cmd: rename to use dash in file name | Stefan Beller | 2018-04-11 | 1 | -1/+1 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'jk/flockfile-stdio' | Junio C Hamano | 2018-04-25 | 1 | -3/+5 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | config: move flockfile() closer to unlocked functionsjk/flockfile-stdio | Jeff King | 2018-03-30 | 1 | -3/+5 | |
| * | | | | Merge branch 'sd/branch-copy' into maint | Junio C Hamano | 2017-12-06 | 1 | -2/+2 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'rs/config-write-section-fix' into maint | Junio C Hamano | 2017-11-28 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
* | | | | | | | sha1_file: convert read_sha1_file to struct object_id | brian m. carlson | 2018-03-14 | 1 | -1/+1 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | Merge branch 'tb/crlf-conv-flags' | Junio C Hamano | 2018-02-13 | 1 | -2/+5 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | convert_to_git(): safe_crlf/checksafe becomes int conv_flagstb/crlf-conv-flags | Torsten Bögershausen | 2018-01-16 | 1 | -2/+5 | |
| | |_|_|/ | |/| | | |