Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 functions | 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_flags | Torsten Bögershausen | 2018-01-16 | 1 | -2/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jh/partial-clone' | Junio C Hamano | 2018-02-13 | 1 | -0/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | partial-clone: define partial clone settings in config | Jeff Hostetler | 2017-12-08 | 1 | -0/+5 |
| |/ / / | |||||
* | | | | Merge branch 'hm/config-parse-expiry-date' | Junio C Hamano | 2017-12-06 | 1 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | config: add --expiry-date | Haaris Mehmood | 2017-11-18 | 1 | -0/+10 |
* | | | | | Merge branch 'rs/config-write-section-fix' | Junio C Hamano | 2017-11-27 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | config: flip return value of write_section() | René Scharfe | 2017-11-18 | 1 | -1/+1 |
* | | | | | Merge branch 'sd/branch-copy' | Junio C Hamano | 2017-11-27 | 1 | -2/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | config: avoid "write_in_full(fd, buf, len) != len" pattern | Phillip Wood | 2017-11-16 | 1 | -2/+2 |
* | | | | | Merge branch 'bp/fsmonitor' | Junio C Hamano | 2017-11-21 | 1 | -0/+14 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | fsmonitor: teach git to optionally utilize a file system monitor to speed up ... | Ben Peart | 2017-10-01 | 1 | -0/+14 |
* | | | | | Merge branch 'ma/lockfile-fixes' | Junio C Hamano | 2017-11-06 | 1 | -11/+10 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | treewide: prefer lockfiles on the stack | Martin Ågren | 2017-10-06 | 1 | -9/+8 |
* | | | | | Merge branch 'jk/ref-filter-colors-fix' | Junio C Hamano | 2017-10-18 | 1 | -4/+0 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Revert "color: check color.ui in git_default_config()" | Jeff King | 2017-10-17 | 1 | -4/+0 |
* | | | | | Merge branch 'sd/branch-copy' | Junio C Hamano | 2017-10-03 | 1 | -23/+91 |
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | branch: add a --copy (-c) option to go with --move (-m) | Sahil Dua | 2017-06-19 | 1 | -20/+82 |
| * | | | config: create a function to format section headers | Sahil Dua | 2017-06-19 | 1 | -2/+11 |
* | | | | Merge branch 'rj/no-sign-compare' | Junio C Hamano | 2017-09-29 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | ALLOC_GROW: avoid -Wsign-compare warnings | Ramsay Jones | 2017-09-22 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jk/fallthrough' | Junio C Hamano | 2017-09-28 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | consistently use "fallthrough" comments in switches | Jeff King | 2017-09-22 | 1 | -0/+1 |
* | | | | | Merge branch 'jk/write-in-full-fix' | Junio C Hamano | 2017-09-25 | 1 | -19/+19 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | config: flip return value of store_write_*() | Jeff King | 2017-09-14 | 1 | -13/+15 |