summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* path: expose `do_git_path()` as `repo_git_pathv()`Patrick Steinhardt2024-08-132-10/+18
* Merge branch 'ps/refs-wo-the-repository' into ps/config-wo-the-repositoryJunio C Hamano2024-08-075-57/+56
|\
| * refs/reftable: stop using `the_repository`Patrick Steinhardt2024-07-301-25/+26
| * refs/packed: stop using `the_repository`Patrick Steinhardt2024-07-301-8/+6
| * refs/files: stop using `the_repository`Patrick Steinhardt2024-07-301-5/+3
| * refs/files: stop using `the_repository` in `parse_loose_ref_contents()`Patrick Steinhardt2024-07-303-12/+16
| * refs: stop using `the_repository`Patrick Steinhardt2024-07-301-7/+5
* | The second batchJunio C Hamano2024-08-011-0/+10
* | Merge branch 'as/show-ref-option-help-update'Junio C Hamano2024-08-011-2/+2
|\ \
| * | show-ref: improve short help messages of optionsAlexander Shopov2024-07-251-2/+2
* | | Merge branch 'jc/doc-reviewing-guidelines-positive-reviews'Junio C Hamano2024-08-011-4/+21
|\ \ \
| * | | ReviewingGuidelines: encourage positive reviews moreJunio C Hamano2024-07-251-4/+21
* | | | Merge branch 'jc/doc-rebase-fuzz-vs-offset-fix'Junio C Hamano2024-08-011-1/+1
|\ \ \ \
| * | | | doc: difference in location to apply is "offset", not "fuzz"Junio C Hamano2024-07-251-1/+1
* | | | | Start the 2.47 cycleJunio C Hamano2024-07-313-2/+44
* | | | | Merge branch 'jc/how-to-maintain-updates'Junio C Hamano2024-07-311-53/+105
|\ \ \ \ \
| * | | | | howto-maintain: update daily tasksJunio C Hamano2024-07-191-43/+63
| * | | | | howto-maintain: cover a whole development cycleJunio C Hamano2024-07-191-10/+42
* | | | | | Merge branch 'tn/doc-commit-fix'Junio C Hamano2024-07-312-2/+2
|\ \ \ \ \ \
| * | | | | | doc: remove dangling closing parenthesisTomas Nordin2024-07-232-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jc/doc-one-shot-export-with-shell-func'Junio C Hamano2024-07-311-0/+27
|\ \ \ \ \ \
| * | | | | | CodingGuidelines: document a shell that "fails" "VAR=VAL shell_func"Junio C Hamano2024-07-231-0/+27
| |/ / / / /
* | | | | | Merge branch 'cp/unit-test-reftable-merged'Junio C Hamano2024-07-314-106/+106
|\ \ \ \ \ \
| * | | | | | t-reftable-merged: add test for REFTABLE_FORMAT_ERRORChandra Pratap2024-07-121-0/+3
| * | | | | | t-reftable-merged: use reftable_ref_record_equal to compare ref recordsChandra Pratap2024-07-121-1/+1
| * | | | | | t-reftable-merged: add tests for reftable_merged_table_max_update_indexChandra Pratap2024-07-121-0/+2
| * | | | | | t-reftable-merged: improve the const-correctness of helper functionsChandra Pratap2024-07-121-10/+9
| * | | | | | t-reftable-merged: improve the test t_merged_single_record()Chandra Pratap2024-07-121-5/+10
| * | | | | | t: harmonize t-reftable-merged.c with coding guidelinesChandra Pratap2024-07-121-40/+28
| * | | | | | t: move reftable/merged_test.c to the unit testing frameworkChandra Pratap2024-07-124-57/+60
* | | | | | | Merge branch 'kn/ci-clang-format'Junio C Hamano2024-07-316-3/+120
|\ \ \ \ \ \ \
| * | | | | | | ci/style-check: add `RemoveBracesLLVM` in CI jobKarthik Nayak2024-07-231-1/+18
| * | | | | | | check-whitespace: detect if no base_commit is providedKarthik Nayak2024-07-232-3/+14
| * | | | | | | ci: run style check on GitHub and GitLabKarthik Nayak2024-07-234-0/+64
| * | | | | | | clang-format: formalize some of the spacing rulesKarthik Nayak2024-07-231-0/+15
| * | | | | | | clang-format: avoid spacing around bitfield colonKarthik Nayak2024-07-231-0/+4
| * | | | | | | clang-format: indent preprocessor directives after hashKarthik Nayak2024-07-231-0/+6
* | | | | | | | Merge branch 'jc/checkout-no-op-switch-errors'Junio C Hamano2024-07-312-7/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: special case error messages during noop switchingJunio C Hamano2024-07-022-7/+27
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'pw/add-patch-with-suppress-blank-empty'Junio C Hamano2024-07-312-8/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | add-patch: use normalize_marker() when recounting edited hunkPhillip Wood2024-07-211-2/+2
| * | | | | | | | add-patch: handle splitting hunks with diff.suppressBlankEmptyPhillip Wood2024-07-212-6/+32
| |/ / / / / / /
* | | | | | | | Merge branch 'rj/make-cleanup'Junio C Hamano2024-07-312-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | config.mak.uname: remove unused uname_P variableRamsay Jones2024-07-181-1/+0
| * | | | | | | | Makefile: drop -Wno-universal-initializer from SP_EXTRA_FLAGSRamsay Jones2024-07-181-1/+1
* | | | | | | | | Merge branch 'jt/doc-post-receive-hook-update'Junio C Hamano2024-07-311-6/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: clarify post-receive hook behaviorJustin Tobler2024-07-151-6/+9
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ad/merge-with-diff-algorithm'Junio C Hamano2024-07-3115-15/+150
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge-recursive: honor diff.algorithmAntonin Delpeuch2024-07-1415-15/+150
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/t-strvec-use-test-msg'Junio C Hamano2024-07-311-32/+15
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |