summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2021-08-30Merge branch 'cb/builtin-merge-format-string-fix'Libravatar Junio C Hamano1-3/+5
2021-08-30Merge branch 'en/ort-becomes-the-default'Libravatar Junio C Hamano2-3/+9
2021-08-30Merge branch 'en/merge-strategy-docs'Libravatar Junio C Hamano1-1/+1
2021-08-30Merge branch 'en/pull-conflicting-options'Libravatar Junio C Hamano2-12/+45
2021-08-24Merge branch 'jt/push-negotiation-fixes'Libravatar Junio C Hamano2-1/+4
2021-08-24Merge branch 'js/expand-runtime-prefix'Libravatar Junio C Hamano3-3/+3
2021-08-24Merge branch 'zh/ref-filter-raw-data'Libravatar Junio C Hamano1-1/+1
2021-08-24Merge branch 'ab/pack-stdin-packs-fix'Libravatar Junio C Hamano1-3/+20
2021-08-24Merge branch 'ds/add-with-sparse-index'Libravatar Junio C Hamano1-3/+12
2021-08-09builtin/merge: avoid -Wformat-extra-args from ancient XcodeLibravatar Carlo Marcelo Arenas Belón1-3/+5
2021-08-05Change default merge backend from recursive to ortLibravatar Elijah Newren2-3/+9
2021-08-05Update error message and code commentLibravatar Elijah Newren1-1/+1
2021-08-04Merge branch 'rs/use-fspathhash'Libravatar Junio C Hamano1-8/+2
2021-08-04Merge branch 'pb/merge-autostash-more'Libravatar Junio C Hamano1-1/+3
2021-08-04Merge branch 'ds/commit-and-checkout-with-sparse-index'Libravatar Junio C Hamano2-5/+6
2021-08-04Merge branch 'ah/plugleaks'Libravatar Junio C Hamano5-14/+17
2021-08-04Merge branch 'ar/submodule-add'Libravatar Junio C Hamano1-113/+304
2021-07-30use fspathhash() everywhereLibravatar René Scharfe1-8/+2
2021-07-29add: remove ensure_full_index() with --renormalizeLibravatar Derrick Stolee1-2/+0
2021-07-29add: ignore outside the sparse-checkout in refresh()Libravatar Derrick Stolee1-1/+9
2021-07-29add: allow operating on a sparse-only indexLibravatar Derrick Stolee1-0/+3
2021-07-28Merge branch 'tb/reverse-midx'Libravatar Junio C Hamano1-1/+1
2021-07-28Merge branch 'ds/status-with-sparse-index'Libravatar Junio C Hamano1-0/+3
2021-07-28Merge branch 'dl/diff-merge-base'Libravatar Junio C Hamano1-2/+2
2021-07-28Merge branch 'ab/attribute-format'Libravatar Junio C Hamano4-6/+6
2021-07-28Merge branch 'jk/log-decorate-optim'Libravatar Junio C Hamano1-0/+3
2021-07-28Merge branch 'sm/worktree-add-lock'Libravatar Junio C Hamano1-5/+16
2021-07-28Merge branch 'hj/commit-allow-empty-message'Libravatar Junio C Hamano1-11/+18
2021-07-26builtin/rebase: fix options.strategy memory lifecycleLibravatar Andrzej Hunt1-1/+2
2021-07-26builtin/merge: free found_ref when doneLibravatar Andrzej Hunt1-1/+2
2021-07-26builtin/mv: free or UNLEAK multiple pointers at end of cmd_mvLibravatar Andrzej Hunt1-0/+5
2021-07-26builtin/for-each-repo: remove unnecessary argv copy to plug leakLibravatar Andrzej Hunt1-10/+4
2021-07-26builtin/submodule--helper: release unused strbuf to avoid leakLibravatar Andrzej Hunt1-2/+4
2021-07-26Use a better name for the function interpolating pathsLibravatar Johannes Schindelin3-3/+3
2021-07-26submodule: drop unused sm_name parameter from show_fetch_remotes()Libravatar Jeff King1-3/+2
2021-07-26ref-filter: use non-const ref_format in *_atom_parser()Libravatar ZheNing Hu1-1/+1
2021-07-23merge: apply autostash if merge strategy failsLibravatar Philippe Blain1-0/+1
2021-07-23merge: apply autostash if fast-forward failsLibravatar Philippe Blain1-0/+1
2021-07-23merge: add missing word "strategy" to a messageLibravatar Philippe Blain1-1/+1
2021-07-22Merge branch 'bc/rev-list-without-commit-line'Libravatar Junio C Hamano1-9/+24
2021-07-22pull: fix handling of multiple headsLibravatar Elijah Newren1-4/+14
2021-07-22pull: update docs & code for option compatibility with rebasingLibravatar Elijah Newren1-0/+2
2021-07-22pull: abort by default when fast-forwarding is not possibleLibravatar Elijah Newren1-4/+6
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyLibravatar Elijah Newren1-1/+15
2021-07-22pull: since --ff-only overrides, handle it firstLibravatar Elijah Newren1-8/+8
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleLibravatar Alex Henrie2-4/+9
2021-07-19multi-pack-index: fix potential segfault without sub-commandLibravatar Taylor Blau1-1/+1
2021-07-16Merge branch 'ab/struct-init'Libravatar Junio C Hamano6-14/+7
2021-07-16Merge branch 'ar/help-micro-cleanup'Libravatar Junio C Hamano1-9/+8
2021-07-16Merge branch 'ar/submodule-helper-include-cleanup'Libravatar Junio C Hamano1-1/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 07:25:09 +0000