summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ds/bundle-uri-clone' into ds/bundle-uri-3Junio C Hamano2022-08-251-0/+19
|\
| * clone: warn on failure to repo_init()Derrick Stolee2022-08-241-2/+3
| * clone: --bundle-uri cannot be combined with --depthDerrick Stolee2022-08-101-0/+3
| * clone: add --bundle-uri optionDerrick Stolee2022-08-101-0/+15
* | Merge branch 'll/disk-usage-humanise'Junio C Hamano2022-08-181-4/+32
|\ \
| * | rev-list: support human-readable output for `--disk-usage`Li Linchao2022-08-111-4/+32
* | | Merge branch 'sy/sparse-rm'Junio C Hamano2022-08-182-85/+6
|\ \ \
| * | | rm: integrate with sparse-indexShaoxuan Yuan2022-08-081-0/+2
| * | | rm: expand the index only when necessaryShaoxuan Yuan2022-08-081-2/+3
| * | | pathspec.h: move pathspec_needs_expanded_index() from reset.c to hereShaoxuan Yuan2022-08-081-83/+1
| * | | Merge branch 'vd/sparse-reset-checkout-fixes' into sy/sparse-rmJunio C Hamano2022-08-081-0/+1
| |\ \ \ | | |/ / | |/| |
* | | | Merge branch 'vd/sparse-reset-checkout-fixes'Junio C Hamano2022-08-181-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | checkout: fix nested sparse directory diff in sparse indexVictoria Dye2022-08-081-0/+1
* | | | Merge branch 'ab/tech-docs-to-help'Junio C Hamano2022-08-151-1/+19
|\ \ \ \
| * | | | git docs: add a category for file formats, protocols and interfacesÆvar Arnfjörð Bjarmason2022-08-041-0/+9
| * | | | git docs: add a category for user-facing file, repo and command UXÆvar Arnfjörð Bjarmason2022-08-041-0/+9
| * | | | git help doc: use "<doc>" instead of "<guide>"Ævar Arnfjörð Bjarmason2022-08-041-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'ab/plug-revisions-leak'Junio C Hamano2022-08-122-11/+25
|\ \ \ \
| * | | | revisions API: don't leak memory on argv elements that need free()-ingÆvar Arnfjörð Bjarmason2022-08-031-1/+4
| * | | | log: refactor "rev.pending" code in cmd_show()Ævar Arnfjörð Bjarmason2022-08-031-10/+15
| * | | | log: fix a memory leak in "git show <revision>..."Ævar Arnfjörð Bjarmason2022-08-031-0/+6
* | | | | Merge branch 'lt/symbolic-ref-sanity'Junio C Hamano2022-08-121-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | symbolic-ref: refuse to set syntactically invalid targetLinus Torvalds2022-08-011-0/+2
| | |_|/ | |/| |
| * | | Merge branch 'ro/mktree-allow-missing-fix' into maintJunio C Hamano2022-07-271-2/+9
| |\ \ \
| * \ \ \ Merge branch 'jk/diff-files-cleanup-fix' into maintJunio C Hamano2022-07-271-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'tb/cat-file-z'Junio C Hamano2022-08-061-3/+25
|\ \ \ \ \ \
| * | | | | | builtin/cat-file.c: support NUL-delimited input with `-z`Taylor Blau2022-07-231-3/+25
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jc/string-list-cleanup'Junio C Hamano2022-08-031-2/+1
|\ \ \ \ \ \
| * | | | | | builtin/remote.c: use the right kind of STRING_LIST_INITJunio C Hamano2022-07-211-2/+1
* | | | | | | Merge branch 'en/merge-restore-to-pristine'Junio C Hamano2022-08-031-14/+43
|\ \ \ \ \ \ \
| * | | | | | | merge: do not exit restore_state() prematurelyElijah Newren2022-07-231-4/+6
| * | | | | | | merge: ensure we can actually restore pre-merge stateElijah Newren2022-07-231-5/+5
| * | | | | | | merge: make restore_state() restore staged state tooElijah Newren2022-07-231-3/+5
| * | | | | | | merge: fix save_state() to work when there are stat-dirty filesElijah Newren2022-07-231-0/+8
| * | | | | | | merge: do not abort early if one strategy fails to handle the mergeElijah Newren2022-07-231-2/+4
| * | | | | | | merge: abort if index does not match HEAD for trivial mergesElijah Newren2022-07-231-0/+15
* | | | | | | | Merge branch 'sa/cat-file-mailmap'Junio C Hamano2022-08-031-1/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | cat-file: add mailmap supportSiddharth Asthana2022-07-181-1/+42
* | | | | | | | | Merge branch 'zh/ls-files-format'Junio C Hamano2022-08-031-0/+95
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | ls-files: introduce "--format" optionZheNing Hu2022-07-231-0/+95
* | | | | | | | | Merge branch 'mt/checkout-count-fix'Junio C Hamano2022-08-011-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: fix two bugs on the final count of updated entriesMatheus Tavares2022-07-141-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ds/rebase-update-ref'Junio C Hamano2022-08-011-0/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | rebase: add rebase.updateRefs config optionDerrick Stolee2022-07-191-0/+5
| * | | | | | | | rebase: add --update-refs optionDerrick Stolee2022-07-191-0/+5
| * | | | | | | | Merge branch 'ds/branch-checked-out' into ds/rebase-update-refJunio C Hamano2022-07-122-37/+20
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/shortlog-sort-stably'Junio C Hamano2022-07-231-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | shortlog: use a stable sortJohannes Schindelin2022-07-141-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'jk/diff-files-cleanup-fix'Junio C Hamano2022-07-201-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | diff-files: move misplaced cleanup labelJeff King2022-07-121-1/+1