summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2022-02-05Merge branch 'rs/grep-expr-cleanup'Libravatar Junio C Hamano1-34/+36
2022-02-05Merge branch 'jh/p4-spawning-external-commands-cleanup'Libravatar Junio C Hamano1-97/+79
2022-02-05Merge branch 'jh/p4-fix-use-of-process-error-exception'Libravatar Junio C Hamano1-3/+3
2022-02-05Merge branch 'jc/find-header'Libravatar Junio C Hamano3-25/+29
2022-02-05Merge branch 'pb/pull-rebase-autostash-fix'Libravatar Junio C Hamano2-4/+16
2022-02-04i18n: fix some misformated placeholders in command synopsisLibravatar Jean-Noël Avila3-4/+4
2022-02-04i18n: remove from i18n strings that do not hold translatable partsLibravatar Jean-Noël Avila17-26/+26
2022-02-04i18n: factorize "invalid value" messagesLibravatar Jean-Noël Avila15-25/+30
2022-02-04i18n: factorize more 'incompatible options' messagesLibravatar Jean-Noël Avila8-32/+79
2022-02-04t0051: use "skip_all" under !MINGW in single-test fileLibravatar Ævar Arnfjörð Bjarmason1-1/+6
2022-02-04branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaksLibravatar Glen Choo1-3/+4
2022-02-04branch: add --recurse-submodules option for branch creationLibravatar Glen Choo14-20/+694
2022-02-03pack-bitmap-write.c: don't return without stop_progress()Libravatar Ævar Arnfjörð Bjarmason1-3/+3
2022-02-03progress API: unify stop_progress{,_msg}(), fix trace2 bugLibravatar Ævar Arnfjörð Bjarmason3-20/+13
2022-02-03progress.c: refactor stop_progress{,_msg}() to use helpersLibravatar Ævar Arnfjörð Bjarmason1-28/+36
2022-02-03progress.c: use dereferenced "progress" variable, not "(*p_progress)"Libravatar Ævar Arnfjörð Bjarmason1-6/+9
2022-02-03progress.h: format and be consistent with progress.c namingLibravatar Ævar Arnfjörð Bjarmason1-3/+2
2022-02-03progress.c tests: test some invalid usageLibravatar Ævar Arnfjörð Bjarmason1-0/+50
2022-02-03progress.c tests: make start/stop commands on stdinLibravatar Ævar Arnfjörð Bjarmason2-32/+70
2022-02-03progress.c test helper: add missing bracesLibravatar Ævar Arnfjörð Bjarmason1-2/+3
2022-02-03leak tests: fix a memory leak in "test-progress" helperLibravatar Ævar Arnfjörð Bjarmason2-0/+2
2022-02-03doc: check-ignore: code-quote an exclamation markLibravatar Philip Oakley1-2/+2
2022-02-02fix typo in git-mktree.txtLibravatar Liginity Lee1-1/+1
2022-02-02completion: add a GIT_COMPLETION_SHOW_ALL_COMMANDSLibravatar Ævar Arnfjörð Bjarmason2-1/+43
2022-02-02completion tests: re-source git-completion.bash in a subshellLibravatar Ævar Arnfjörð Bjarmason1-21/+29
2022-02-02t/lib-read-tree-m-3way: indent with tabsLibravatar Shaoxuan Yuan1-48/+48
2022-02-02t/lib-read-tree-m-3way: modernize styleLibravatar Shaoxuan Yuan1-77/+77
2022-02-02builtin/diff.c: fix "git-diff" usage string typoLibravatar Shaoxuan Yuan1-3/+3
2022-02-02patch-id: fix scan_hunk_header on diffs with 1 line of before/afterLibravatar Jerry Zhang2-3/+37
2022-02-02patch-id: fix antipatterns in testsLibravatar Jerry Zhang1-33/+31
2022-02-02diff-merges: avoid history simplifications when diffing mergesLibravatar Elijah Newren2-1/+59
2022-02-02merge-ort: mark conflict/warning messages from inner merges as omittableLibravatar Elijah Newren1-1/+3
2022-02-02show, log: include conflict/warning messages in --remerge-diff headersLibravatar Elijah Newren4-0/+206
2022-02-02diff: add ability to insert additional headers for pathsLibravatar Elijah Newren3-6/+123
2022-02-02merge-ort: format messages slightly different for use in headersLibravatar Elijah Newren3-2/+46
2022-02-02merge-ort: mark a few more conflict messages as omittableLibravatar Elijah Newren1-2/+2
2022-02-02merge-ort: capture and print ll-merge warnings in our preferred fashionLibravatar Elijah Newren3-6/+17
2022-02-02ll-merge: make callers responsible for showing warningsLibravatar Elijah Newren9-32/+63
2022-02-02log: clean unneeded objects during `log --remerge-diff`Libravatar Elijah Newren5-7/+28
2022-02-02show, log: provide a --remerge-diff capabilityLibravatar Elijah Newren6-2/+191
2022-02-02repo-settings: rename the traditional default fetch.negotiationAlgorithmLibravatar Elijah Newren5-17/+21
2022-02-02repo-settings: fix error handling for unknown valuesLibravatar Elijah Newren2-0/+9
2022-02-02repo-settings: fix checking for fetch.negotiationAlgorithm=defaultLibravatar Elijah Newren2-3/+16
2022-02-01perl Git.pm: don't ignore signalled failure in _cmd_close()Libravatar Ævar Arnfjörð Bjarmason5-6/+19
2022-02-01receive-pack: purge temporary data if no command is ready to runLibravatar Chen Bojun2-0/+17
2022-02-01builtin/branch: consolidate action-picking logic in cmd_branch()Libravatar Glen Choo1-8/+11
2022-02-01branch: add a dry_run parameter to create_branch()Libravatar Glen Choo4-4/+11
2022-02-01branch: make create_branch() always create a branchLibravatar Glen Choo3-32/+46
2022-02-01branch: move --set-upstream-to behavior to dwim_and_setup_tracking()Libravatar Glen Choo3-26/+92
2022-02-01subtree: force merge commitLibravatar Thomas Koutcher1-2/+2