summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2022-02-03progress API: unify stop_progress{,_msg}(), fix trace2 bugÆvar Arnfjörð Bjarmason3-20/+13
2022-02-03progress.c: refactor stop_progress{,_msg}() to use helpersÆvar Arnfjörð Bjarmason1-27/+35
2022-02-03progress.c: use dereferenced "progress" variable, not "(*p_progress)"Ævar Arnfjörð Bjarmason1-6/+9
2022-02-03progress.h: format and be consistent with progress.c namingÆvar Arnfjörð Bjarmason1-3/+2
2022-02-03progress.c tests: test some invalid usageÆvar Arnfjörð Bjarmason1-0/+50
2022-02-03progress.c tests: make start/stop commands on stdinÆvar Arnfjörð Bjarmason2-32/+70
2022-02-03progress.c test helper: add missing bracesÆvar Arnfjörð Bjarmason1-2/+3
2022-02-03leak tests: fix a memory leak in "test-progress" helperÆvar Arnfjörð Bjarmason2-0/+2
2022-02-03doc: check-ignore: code-quote an exclamation markPhilip Oakley1-2/+2
2022-02-02fix typo in git-mktree.txtLiginity Lee1-1/+1
2022-02-02completion: add a GIT_COMPLETION_SHOW_ALL_COMMANDSÆvar Arnfjörð Bjarmason2-1/+43
2022-02-02completion tests: re-source git-completion.bash in a subshellÆvar Arnfjörð Bjarmason1-21/+29
2022-02-02t/lib-read-tree-m-3way: indent with tabsShaoxuan Yuan1-48/+48
2022-02-02t/lib-read-tree-m-3way: modernize styleShaoxuan Yuan1-75/+75
2022-02-02builtin/diff.c: fix "git-diff" usage string typoShaoxuan Yuan1-3/+3
2022-02-02patch-id: fix scan_hunk_header on diffs with 1 line of before/afterJerry Zhang2-3/+37
2022-02-02patch-id: fix antipatterns in testsJerry Zhang1-33/+31
2022-02-02diff-merges: avoid history simplifications when diffing mergesElijah Newren2-1/+59
2022-02-02merge-ort: mark conflict/warning messages from inner merges as omittableElijah Newren1-1/+3
2022-02-02show, log: include conflict/warning messages in --remerge-diff headersElijah Newren4-0/+206
2022-02-02diff: add ability to insert additional headers for pathsElijah Newren3-6/+123
2022-02-02merge-ort: format messages slightly different for use in headersElijah Newren3-2/+46
2022-02-02merge-ort: mark a few more conflict messages as omittableElijah Newren1-2/+2
2022-02-02merge-ort: capture and print ll-merge warnings in our preferred fashionElijah Newren3-6/+17
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren9-32/+63
2022-02-02log: clean unneeded objects during `log --remerge-diff`Elijah Newren5-7/+28
2022-02-02show, log: provide a --remerge-diff capabilityElijah Newren6-2/+191
2022-02-02repo-settings: rename the traditional default fetch.negotiationAlgorithmElijah Newren5-17/+21
2022-02-02repo-settings: fix error handling for unknown valuesElijah Newren2-0/+9
2022-02-02repo-settings: fix checking for fetch.negotiationAlgorithm=defaultElijah Newren2-3/+16
2022-02-01perl Git.pm: don't ignore signalled failure in _cmd_close()Ævar Arnfjörð Bjarmason5-6/+19
2022-02-01receive-pack: purge temporary data if no command is ready to runChen Bojun2-0/+17
2022-02-01builtin/branch: consolidate action-picking logic in cmd_branch()Glen Choo1-8/+11
2022-02-01branch: add a dry_run parameter to create_branch()Glen Choo4-4/+11
2022-02-01branch: make create_branch() always create a branchGlen Choo3-31/+45
2022-02-01branch: move --set-upstream-to behavior to dwim_and_setup_tracking()Glen Choo3-26/+92
2022-02-01subtree: force merge commitThomas Koutcher1-2/+2
2022-01-31t5312: prepare for reftableHan-Wen Nienhuys1-5/+5
2022-01-31t1405: mark test that checks existence as REFFILESHan-Wen Nienhuys1-1/+1
2022-01-31t1405: explictly delete reflogs for reftableHan-Wen Nienhuys1-0/+6
2022-01-31fetch --prune: exit with error if pruning failsThomas Gummerer2-4/+17
2022-01-31Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodulesJunio C Hamano16-67/+312
2022-01-28Sync with Git 2.35.1Junio C Hamano1-0/+6
2022-01-28Name the next one 2.36 to prepare for 2.35.1Junio C Hamano2-1/+35
2022-01-28Git 2.35.1v2.35.1Junio C Hamano3-2/+8
2022-01-28Merge branch 'en/keep-cwd' into maintJunio C Hamano3-2/+30
2022-01-28scalar: accept -C and -c options before the subcommandJohannes Schindelin3-1/+39
2022-01-28fetch: fix negotiate-only error messageRobert Coup2-2/+2
2022-01-28sparse-checkout: fix a couple minor memory leaksElijah Newren1-0/+2
2022-01-28diff-filter: be more careful when looking for negative bitsJohannes Schindelin3-17/+21