summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'dl/opt-callback-cleanup'Junio C Hamano2020-05-0531-181/+173
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu2020-04-2831-181/+173
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/test-fail-prereqs-fix'Junio C Hamano2020-05-051-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t0000: disable GIT_TEST_FAIL_PREREQS in sub-testsJeff King2020-04-281-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'dd/iso-8601-updates'Junio C Hamano2020-05-053-16/+62
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | date.c: allow compact version of ISO-8601 datetimeĐoàn Trần Công Danh2020-04-242-0/+17
| * | | | | | | | | date.c: skip fractional second part of ISO-8601Đoàn Trần Công Danh2020-04-243-1/+19
| * | | | | | | | | date.c: validate and set time in a helper functionĐoàn Trần Công Danh2020-04-241-4/+15
| * | | | | | | | | date.c: s/is_date/set_date/Đoàn Trần Công Danh2020-04-231-11/+11
* | | | | | | | | | Merge branch 'bc/wildcard-credential'Junio C Hamano2020-05-054-6/+58
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | credential: fix matching URLs with multiple levels in pathbrian m. carlson2020-04-274-6/+58
* | | | | | | | | | The sixth batchJunio C Hamano2020-05-011-0/+52
* | | | | | | | | | Merge branch 'jt/v2-fetch-nego-fix'Junio C Hamano2020-05-012-12/+86
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fetch-pack: in protocol v2, reset in_vain upon ACKJonathan Tan2020-04-282-0/+31
| * | | | | | | | | | fetch-pack: in protocol v2, in_vain only after ACKJonathan Tan2020-04-282-4/+27
| * | | | | | | | | | fetch-pack: return enum from process_acks()Jonathan Tan2020-04-281-8/+28
* | | | | | | | | | | Merge branch 'js/anonymise-push-url-in-errors'Junio C Hamano2020-05-011-2/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | push: anonymize URLs in error messages and warningsJohannes Schindelin2020-04-291-2/+4
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'es/bugreport'Junio C Hamano2020-05-0116-131/+458
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bugreport: drop extraneous includesEmily Shaffer2020-04-281-2/+0
| * | | | | | | | | | | bugreport: add compiler infoEmily Shaffer2020-04-173-0/+48
| * | | | | | | | | | | bugreport: add uname infoEmily Shaffer2020-04-172-1/+16
| * | | | | | | | | | | bugreport: gather git version and build infoEmily Shaffer2020-04-174-19/+51
| * | | | | | | | | | | bugreport: add tool to generate debugging infoEmily Shaffer2020-04-178-0/+224
| * | | | | | | | | | | help: move list_config_help to builtin/helpEmily Shaffer2020-04-179-113/+123
* | | | | | | | | | | | Merge branch 'en/rebase-root-and-fork-point-are-incompatible'Junio C Hamano2020-05-012-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rebase: display an error if --root and --fork-point are both providedElijah Newren2020-04-272-2/+8
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ds/build-homebrew-gettext-fix'Junio C Hamano2020-05-011-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | macOS/brew: let the build find gettext headers/libraries/msgfmtJohannes Schindelin2020-04-271-2/+11
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'dd/sparse-fixes'Junio C Hamano2020-05-018-15/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | progress.c: silence cgcc suggestion about internal linkageĐoàn Trần Công Danh2020-04-273-9/+10
| * | | | | | | | | | | | graph.c: limit linkage of internal variableĐoàn Trần Công Danh2020-04-271-1/+1
| * | | | | | | | | | | | compat/regex: move stdlib.h up in inclusion chainĐoàn Trần Công Danh2020-04-272-1/+1
| * | | | | | | | | | | | test-parse-pathspec-file.c: s/0/NULL/ for pointer typeĐoàn Trần Công Danh2020-04-271-3/+3
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mt/doc-worktree-ref'Junio C Hamano2020-05-011-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | config doc: fix reference to config.worktree infoMatheus Tavares2020-04-251-5/+6
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'eb/gitweb-more-trailers'Junio C Hamano2020-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitweb: Recognize *-to and Closes/Fixes trailersEmma Brooks2020-04-251-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ds/multi-pack-index'Junio C Hamano2020-05-012-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | multi-pack-index: close file descriptor after mmapDerrick Stolee2020-04-242-5/+1
* | | | | | | | | | | | | Merge branch 'ds/blame-on-bloom'Junio C Hamano2020-05-019-23/+211
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | test-bloom: check that we have expected argumentsJeff King2020-04-241-4/+16
| * | | | | | | | | | | | | test-bloom: fix some whitespace issuesJeff King2020-04-241-5/+5
| * | | | | | | | | | | | | blame: drop unused parameter from maybe_changed_pathJeff King2020-04-231-3/+1
| * | | | | | | | | | | | | blame: use changed-path Bloom filtersDerrick Stolee2020-04-173-9/+146
| * | | | | | | | | | | | | tests: write commit-graph with Bloom filtersDerrick Stolee2020-04-174-5/+29
| * | | | | | | | | | | | | revision: complicated pathspecs disable filtersDerrick Stolee2020-04-171-1/+18
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'gs/commit-graph-path-filter'Junio C Hamano2020-05-0122-11/+1140
|\| | | | | | | | | | | |
| * | | | | | | | | | | | bloom: ignore renames when computing changed pathsDerrick Stolee2020-04-091-0/+1
| * | | | | | | | | | | | commit-graph: add GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS test flagGarima Singh2020-04-066-1/+12