Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling' | Junio C Hamano | 2023-04-17 | 3 | -81/+20 |
|\ | |||||
| * | rebase: remove a couple of redundant strategy tests | Phillip Wood | 2023-04-10 | 2 | -53/+0 |
| * | rebase -m: fix serialization of strategy options | Phillip Wood | 2023-04-10 | 2 | -36/+22 |
| * | rebase -m: cleanup --strategy-option handling | Phillip Wood | 2023-04-10 | 1 | -2/+8 |
* | | Merge branch 'tk/mergetool-gui-default-config' | Junio C Hamano | 2023-04-17 | 2 | -0/+90 |
|\ \ | |||||
| * | | mergetool: new config guiDefault supports auto-toggling gui by DISPLAY | Tao Klerks | 2023-04-05 | 2 | -0/+90 |
* | | | Merge branch 'sl/sparse-write-tree' | Junio C Hamano | 2023-04-17 | 2 | -0/+29 |
|\ \ \ | |||||
| * | | | write-tree: integrate with sparse index | Shuqi Liang | 2023-04-04 | 2 | -0/+29 |
* | | | | Merge branch 'jk/use-perl-path-consistently' | Junio C Hamano | 2023-04-11 | 2 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | t/lib-httpd: pass PERL_PATH to CGI scripts | Jeff King | 2023-04-06 | 2 | -1/+3 |
* | | | | | Merge branch 'jc/clone-object-format-from-void' | Junio C Hamano | 2023-04-11 | 1 | -0/+11 |
|\ \ \ \ \ | |||||
| * | | | | | clone: propagate object-format when cloning from void | Junio C Hamano | 2023-04-05 | 1 | -0/+11 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'ar/adjust-tests-for-the-index-fallout' | Junio C Hamano | 2023-04-11 | 2 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | t2107: fix mention of the_index.cache_changed | Andrei Rybak | 2023-03-31 | 1 | -1/+1 |
| * | | | | | t3060: fix mention of function prune_index | Andrei Rybak | 2023-03-31 | 1 | -2/+2 |
* | | | | | | Merge branch 'jc/spell-id-in-both-caps-in-message-id' | Junio C Hamano | 2023-04-11 | 9 | -60/+60 |
|\ \ \ \ \ \ | |||||
| * | | | | | | e-mail workflow: Message-ID is spelled with ID in both capital letters | Junio C Hamano | 2023-04-03 | 9 | -60/+60 |
* | | | | | | | Merge branch 'ws/sparse-check-rules' | Junio C Hamano | 2023-04-11 | 1 | -2/+165 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | builtin/sparse-checkout: add check-rules command | William Sprent | 2023-03-27 | 1 | -2/+132 |
| * | | | | | | | builtin/sparse-checkout: remove NEED_WORK_TREE flag | William Sprent | 2023-03-27 | 1 | -0/+33 |
* | | | | | | | | Merge branch 'ds/fetch-bundle-uri-with-all' | Junio C Hamano | 2023-04-06 | 1 | -0/+34 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch: download bundles once, even with --all | Derrick Stolee | 2023-03-31 | 1 | -0/+34 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/chainlint-fixes' | Junio C Hamano | 2023-04-06 | 7 | -18/+50 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | tests: skip test_eval_ in internal chain-lint | Jeff King | 2023-03-30 | 1 | -11/+6 |
| * | | | | | | | | tests: drop here-doc check from internal chain-linter | Jeff King | 2023-03-30 | 1 | -2/+3 |
| * | | | | | | | | tests: diagnose unclosed here-doc in chainlint.pl | Eric Sunshine | 2023-03-30 | 5 | -3/+34 |
| * | | | | | | | | tests: replace chainlint subshell with a function | Jeff King | 2023-03-30 | 1 | -1/+5 |
| * | | | | | | | | tests: run internal chain-linter under "make test" | Jeff King | 2023-03-30 | 2 | -3/+4 |
* | | | | | | | | | Merge branch 'en/header-split-cleanup' | Junio C Hamano | 2023-04-06 | 43 | -28/+57 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | write-or-die.h: move declarations for write-or-die.c functions from cache.h | Elijah Newren | 2023-03-21 | 1 | -1/+2 |
| * | | | | | | | | | treewide: remove cache.h inclusion due to setup.h changes | Elijah Newren | 2023-03-21 | 15 | -18/+3 |
| * | | | | | | | | | setup.h: move declarations for setup.c functions from cache.h | Elijah Newren | 2023-03-21 | 35 | -1/+35 |
| * | | | | | | | | | treewide: remove cache.h inclusion due to environment.h changes | Elijah Newren | 2023-03-21 | 1 | -1/+1 |
| * | | | | | | | | | environment.h: move declarations for environment.c functions from cache.h | Elijah Newren | 2023-03-21 | 4 | -0/+4 |
| * | | | | | | | | | treewide: remove unnecessary includes of cache.h | Elijah Newren | 2023-03-21 | 2 | -2/+1 |
| * | | | | | | | | | wrapper.h: move declarations for wrapper.c functions from cache.h | Elijah Newren | 2023-03-21 | 3 | -0/+3 |
| * | | | | | | | | | abspath.h: move absolute path functions from cache.h | Elijah Newren | 2023-03-21 | 1 | -0/+1 |
| * | | | | | | | | | treewide: remove unnecessary cache.h inclusion from several sources | Elijah Newren | 2023-03-21 | 1 | -1/+0 |
| * | | | | | | | | | treewide: remove unnecessary inclusion of gettext.h | Elijah Newren | 2023-03-21 | 3 | -3/+0 |
| * | | | | | | | | | treewide: be explicit about dependence on gettext.h | Elijah Newren | 2023-03-21 | 4 | -0/+4 |
| * | | | | | | | | | treewide: remove unnecessary cache.h inclusion from a few headers | Elijah Newren | 2023-03-21 | 4 | -2/+4 |
* | | | | | | | | | | Merge branch 'ab/remove-implicit-use-of-the-repository' | Junio C Hamano | 2023-04-06 | 6 | -19/+27 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | cocci: apply the "pretty.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 2023-03-28 | 1 | -1/+2 |
| * | | | | | | | | | | cocci: apply the "commit.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 2023-03-28 | 1 | -4/+5 |
| * | | | | | | | | | | cocci: apply the "commit-reach.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 2023-03-28 | 1 | -3/+7 |
| * | | | | | | | | | | cocci: apply the "cache.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 2023-03-28 | 5 | -11/+13 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'gc/config-parsing-cleanup' | Junio C Hamano | 2023-04-06 | 2 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | config: report cached filenames in die_bad_number() | Glen Choo | 2023-03-28 | 2 | -0/+26 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'ab/config-multi-and-nonbool' | Junio C Hamano | 2023-04-06 | 11 | -8/+288 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | for-each-repo: with bad config, don't conflate <path> and <cmd> | Ævar Arnfjörð Bjarmason | 2023-03-28 | 1 | -0/+13 |