summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* receive-pack: use bug() and BUG_if_bug()Ævar Arnfjörð Bjarmason2022-06-021-10/+6
* Merge branch 'js/use-builtin-add-i'Junio C Hamano2022-05-311-10/+5
|\
| * add -i: default to the built-in implementationJohannes Schindelin2021-12-011-10/+5
* | Merge branch 'ac/remote-v-with-object-list-filters'Junio C Hamano2022-05-261-5/+13
|\ \
| * | builtin/remote.c: teach `-v` to list filters for promisor remotesAbhradeep Chakraborty2022-05-091-5/+13
* | | Merge branch 'tk/simple-autosetupmerge'Junio C Hamano2022-05-261-13/+51
|\ \ \
| * | | push: new config option "push.autoSetupRemote" supports "simple" pushTao Klerks2022-04-291-8/+36
| * | | branch: new autosetupmerge option 'simple' for matching branchesTao Klerks2022-04-291-5/+15
* | | | Merge branch 'tb/receive-pack-code-cleanup'Junio C Hamano2022-05-261-2/+1
|\ \ \ \
| * | | | builtin/receive-pack.c: remove redundant 'if'Taylor Blau2022-05-181-2/+1
* | | | | Merge branch 'jc/avoid-redundant-submodule-fetch'Junio C Hamano2022-05-261-1/+15
|\ \ \ \ \
| * | | | | fetch: do not run a redundant fetch from submoduleJunio C Hamano2022-05-181-1/+15
* | | | | | Merge branch 'os/fetch-check-not-current-branch'Junio C Hamano2022-05-261-0/+1
|\ \ \ \ \ \
| * | | | | | fetch: limit shared symref check only for local branchesOrgad Shaneh2022-05-161-0/+1
| |/ / / / /
* | | | | | Merge branch 'jc/show-branch-g-current'Junio C Hamano2022-05-261-0/+4
|\ \ \ \ \ \
| * | | | | | show-branch: -g and --current are incompatibleJunio C Hamano2022-04-211-0/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ab/commit-plug-leaks'Junio C Hamano2022-05-231-3/+6
|\ \ \ \ \ \
| * | | | | | commit: fix "author_ident" leakJunio C Hamano2022-05-131-3/+6
| |/ / / / /
* | | | | | Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano2022-05-2116-27/+27
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano2022-05-0216-27/+27
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | tree-wide: apply equals-null.cocciJunio C Hamano2022-05-0216-27/+27
* | | | | | | Merge branch 'ds/sparse-colon-path'Junio C Hamano2022-05-212-0/+8
|\ \ \ \ \ \ \
| * | | | | | | rev-parse: integrate with sparse indexDerrick Stolee2022-04-261-0/+3
| * | | | | | | show: integrate with the sparse indexDerrick Stolee2022-04-261-0/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'vd/sparse-stash'Junio C Hamano2022-05-211-6/+27
|\ \ \ \ \ \ \
| * | | | | | | stash: apply stash using 'merge_ort_nonrecursive()'Victoria Dye2022-05-111-6/+24
| * | | | | | | stash: integrate with sparse indexVictoria Dye2022-05-111-0/+3
| |/ / / / / /
* | | | | | | Merge branch 'cd/bisect-messages-from-pre-flight-states'Junio C Hamano2022-05-211-13/+56
|\ \ \ \ \ \ \
| * | | | | | | bisect: output bisect setup status in bisect logChris Down2022-05-111-5/+21
| * | | | | | | bisect: output state before we are ready to compute bisectionChris Down2022-05-111-13/+40
| | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'rs/format-patch-pathspec-fix' into maintJunio C Hamano2022-05-051-7/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/fast-export-pathspec-fix' into maintJunio C Hamano2022-05-051-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/show-pathspec-fix' into maintJunio C Hamano2022-05-051-5/+18
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/name-rev-fix-free-after-use' into maintJunio C Hamano2022-05-051-16/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-tree-stdin-fix' into maintJunio C Hamano2022-05-051-0/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'gc/submodule-update-part2' into maintJunio C Hamano2022-05-051-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'gc/pull-recurse-submodules'Junio C Hamano2022-05-211-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pull: do not let submodule.recurse override fetch.recurseSubmodulesGlen Choo2022-05-121-3/+7
* | | | | | | | | | | | | Merge branch 'gf/unused-includes'Junio C Hamano2022-05-211-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | apply.c: remove unnecessary includeGarrit Franke2022-04-061-1/+0
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ea/rebase-code-simplify'Junio C Hamano2022-05-111-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rebase: simplify an assignment of options.type in cmd_rebaseEdmundo Carmona Antoranz2022-04-201-4/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ah/rebase-keep-base-fix'Junio C Hamano2022-05-111-27/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rebase: use correct base for --keep-base when a branch is givenAlex Henrie2022-04-211-27/+28
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ea/progress-partial-blame'Junio C Hamano2022-05-111-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | blame: report correct number of lines in progress when using rangesEdmundo Carmona Antoranz2022-04-061-1/+5
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ds/midx-normalize-pathname-before-comparison'Junio C Hamano2022-05-041-11/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | multi-pack-index: use --object-dir real pathDerrick Stolee2022-04-251-11/+34
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jc/clone-remote-name-leak-fix'Junio C Hamano2022-05-041-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clone: plug a miniscule leakJunio C Hamano2022-05-011-1/+3
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |