summaryrefslogtreecommitdiffstats
path: root/git-p4.py (unfollow)
Commit message (Expand)AuthorFilesLines
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-02perl 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-32/+46
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-02-01t5312: prepare for reftableHan-Wen Nienhuys1-5/+5
2022-02-01t1405: mark test that checks existence as REFFILESHan-Wen Nienhuys1-1/+1
2022-02-01t1405: explictly delete reflogs for reftableHan-Wen Nienhuys1-0/+6
2022-01-31fetch --prune: exit with error if pruning failsThomas Gummerer2-4/+17
2022-01-29Name the next one 2.36 to prepare for 2.35.1Junio C Hamano2-1/+35
2022-01-29Git 2.35.1v2.35.1Junio C Hamano3-2/+8
2022-01-29scalar: accept -C and -c options before the subcommandJohannes Schindelin3-1/+39
2022-01-29fetch: 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
2022-01-28diff.c: move the diff filter bits definitions up a bitJohannes Schindelin1-37/+37
2022-01-28docs(diff): lose incorrect claim about `diff-files --diff-filter=A`Johannes Schindelin1-5/+2
2022-01-28stash: stop warning about the obsolete `stash.useBuiltin` config settingJohannes Schindelin2-25/+0
2022-01-28stash: remove documentation for `stash.useBuiltin`Johannes Schindelin1-7/+0
2022-01-28add: remove support for `git-legacy-stash`Johannes Schindelin1-14/+0
2022-01-28git-sh-setup: remove remnant bits referring to `git-legacy-stash`Johannes Schindelin1-1/+0
2022-01-28SubmittingPatches: explain why we care about log messagesJunio C Hamano1-0/+29
2022-01-28CodingGuidelines: hint why we value clearly written log messagesJunio C Hamano1-0/+7
2022-01-28SubmittingPatches: write problem statement in the log in the present tenseJunio C Hamano1-0/+7
2022-01-27pack-bitmap.c: gracefully fallback after opening pack/MIDXTaylor Blau3-0/+51
2022-01-27midx: read `RIDX` chunk when presentTaylor Blau7-7/+54
2022-01-27t/lib-bitmap.sh: parameterize tests over reverse index sourceTaylor Blau1-6/+14
2022-01-27t5326: move tests to t/lib-bitmap.shTaylor Blau2-171/+179
2022-01-27t5326: extract `test_rev_exists`Taylor Blau1-15/+22
2022-01-27t5326: drop unnecessary setupTaylor Blau1-4/+0
2022-01-27pack-revindex.c: instrument loading on-disk reverse indexTaylor Blau1-0/+3
2022-01-27midx.c: make changing the preferred pack safeTaylor Blau4-10/+29
2022-01-27t5326: demonstrate bitmap corruption after permutationTaylor Blau1-0/+31
2022-01-27Start post 2.35 cycleJunio C Hamano1-1/+1
2022-01-27Documentation/config/pgp.txt: add missing apostropheGreg Hurrell1-1/+1
2022-01-27Documentation/config/pgp.txt: replace stray <TAB> character with <SPC>Greg Hurrell1-1/+1
2022-01-27refs API: remove "failure_errno" from refs_resolve_ref_unsafe()Ævar Arnfjörð Bjarmason7-77/+33