summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Git 2.30.1v2.30.1Junio C Hamano2021-02-082-1/+9
* Merge branch 'pb/ci-matrix-wo-shortcut' into maintJunio C Hamano2021-02-081-0/+4
|\
| * ci: do not cancel all jobs of a matrix if one failsPhilippe Blain2021-01-281-0/+4
* | Merge branch 'pb/blame-funcname-range-userdiff' into maintJunio C Hamano2021-02-081-4/+4
|\ \
| * | annotate-tests: quote variable expansions containing path namesJohannes Sixt2021-01-311-4/+4
* | | Merge branch 'jk/p5303-sed-portability-fix' into maintJunio C Hamano2021-02-081-4/+8
|\ \ \
| * | | p5303: avoid sed GNU-ismJeff King2021-01-301-4/+8
| | |/ | |/|
* | | Merge branch 'ab/branch-sort' into maintJunio C Hamano2021-02-088-44/+111
|\ \ \
| * | | branch: show "HEAD detached" first under reverse sortÆvar Arnfjörð Bjarmason2021-01-082-4/+7
| * | | branch: sort detached HEAD based on a flagÆvar Arnfjörð Bjarmason2021-01-086-25/+32
| * | | ref-filter: move ref_sorting flags to a bitfieldÆvar Arnfjörð Bjarmason2021-01-085-17/+25
| * | | ref-filter: move "cmp_fn" assignment into "else if" armÆvar Arnfjörð Bjarmason2021-01-081-2/+2
| * | | ref-filter: add braces to if/else if/else chainÆvar Arnfjörð Bjarmason2021-01-081-3/+3
| * | | branch tests: add to --sort testsÆvar Arnfjörð Bjarmason2021-01-071-1/+50
| * | | branch: change "--local" to "--list" in commentÆvar Arnfjörð Bjarmason2021-01-071-1/+1
| |/ /
* | | Merge branch 'ma/more-opaque-lock-file' into maintJunio C Hamano2021-02-085-15/+15
|\ \ \
| * | | read-cache: try not to peek into `struct {lock_,temp}file`Martin Ågren2021-01-061-6/+6
| * | | refs/files-backend: don't peek into `struct lock_file`Martin Ågren2021-01-061-2/+2
| * | | midx: don't peek into `struct lock_file`Martin Ågren2021-01-061-1/+1
| * | | commit-graph: don't peek into `struct lock_file`Martin Ågren2021-01-061-3/+3
| * | | builtin/gc: don't peek into `struct lock_file`Martin Ågren2021-01-061-3/+3
| |/ /
* | | Merge branch 'dl/p4-encode-after-kw-expansion' into maintJunio C Hamano2021-02-081-1/+1
|\ \ \
| * | | git-p4: fix syncing file types with patternDaniel Levin2020-12-231-1/+1
* | | | Merge branch 'ar/t6016-modernise' into maintJunio C Hamano2021-02-081-187/+167
|\ \ \ \
| * | | | t6016: move to lib-log-graph.sh frameworkAntonio Russo2021-01-041-187/+167
| | |/ / | |/| |
* | | | Merge branch 'zh/arg-help-format' into maintJunio C Hamano2021-02-088-64/+64
|\ \ \ \
| * | | | builtin/*: update usage formatZheNing Hu2021-01-077-61/+61
| * | | | parse-options: format argh like error messagesJunio C Hamano2021-01-071-3/+3
| |/ / /
* | | | Merge branch 'ma/doc-pack-format-varint-for-sizes' into maintJunio C Hamano2021-02-081-1/+16
|\ \ \ \
| * | | | pack-format.txt: document sizes at start of delta dataMartin Ågren2021-01-041-1/+16
| | |/ / | |/| |
* | | | Merge branch 'ma/t1300-cleanup' into maintJunio C Hamano2021-02-081-40/+32
|\ \ \ \
| * | | | t1300: don't needlessly work with `core.foo` configsMartin Ågren2021-01-041-30/+30
| * | | | t1300: remove duplicate test for `--file no-such-file`Martin Ågren2021-01-041-6/+2
| * | | | t1300: remove duplicate test for `--file ../foo`Martin Ågren2021-01-041-4/+0
| | |/ / | |/| |
* | | | Merge branch 'fc/t6030-bisect-reset-removes-auxiliary-files' into maintJunio C Hamano2021-02-081-8/+8
|\ \ \ \
| * | | | test: bisect-porcelain: fix location of filesFelipe Contreras2020-12-211-8/+8
| | |/ / | |/| |
* | | | Prepare for 2.30.1Junio C Hamano2021-02-063-2/+49
* | | | Merge branch 'js/skip-dashed-built-ins-from-config-mak' into maintJunio C Hamano2021-02-061-14/+14
|\ \ \ \
| * | | | SKIP_DASHED_BUILT_INS: respect `config.mak`Johannes Schindelin2021-01-211-14/+14
| |/ / /
* | | | Merge branch 'jt/packfile-as-uri-doc' into maintJunio C Hamano2021-02-061-2/+5
|\ \ \ \
| * | | | Doc: clarify contents of packfile sent as URIJonathan Tan2021-01-211-2/+5
| | |/ / | |/| |
* | | | Merge branch 'ab/fsck-doc-fix' into maintJunio C Hamano2021-02-061-8/+0
|\ \ \ \
| * | | | fsck doc: remove ancient out-of-date diagnosticsÆvar Arnfjörð Bjarmason2021-01-211-8/+0
| | |/ / | |/| |
* | | | Merge branch 'jk/log-cherry-pick-duplicate-patches' into maintJunio C Hamano2021-02-064-4/+48
|\ \ \ \
| * | | | patch-ids: handle duplicate hashmap entriesJeff King2021-01-124-4/+48
| |/ / /
* | | | Merge branch 'jk/forbid-lf-in-git-url' into maintJunio C Hamano2021-02-064-1/+23
|\ \ \ \
| * | | | fsck: reject .gitmodules git:// urls with newlinesJeff King2021-01-072-1/+16
| * | | | git_connect_git(): forbid newlines in host and pathJeff King2021-01-072-0/+7
* | | | | Merge branch 'jc/macos-install-dependencies-fix' into maintJunio C Hamano2021-02-061-4/+4
|\ \ \ \ \
| * | | | | ci/install-depends: attempt to fix "brew cask" stuffJunio C Hamano2021-01-151-4/+4
| | |_|/ / | |/| | |