summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* builtin/diagnose.c: create 'git diagnose' builtinVictoria Dye2022-08-127-0/+143
* diagnose.c: add option to configure archive contentsVictoria Dye2022-08-123-10/+39
* scalar-diagnose: move functionality to common locationVictoria Dye2022-08-124-200/+227
* scalar-diagnose: move 'get_disk_info()' to 'compat/'Victoria Dye2022-08-123-52/+58
* scalar-diagnose: add directory to archiver more gentlyVictoria Dye2022-08-121-2/+8
* scalar-diagnose: avoid 32-bit overflow of size_tVictoria Dye2022-08-121-1/+1
* scalar-diagnose: use "$GIT_UNZIP" in testVictoria Dye2022-08-121-4/+4
* The eighth batchJunio C Hamano2022-08-011-0/+16
* Merge branch 'mt/pkt-line-comment-tweak'Junio C Hamano2022-08-011-8/+8
|\
| * pkt-line.h: move comment closer to the associated codeMatheus Tavares2022-07-221-8/+8
* | Merge branch 'mt/checkout-count-fix'Junio C Hamano2022-08-0110-24/+113
|\ \
| * | checkout: fix two bugs on the final count of updated entriesMatheus Tavares2022-07-149-25/+40
| * | checkout: show bug about failed entries being included in final reportMatheus Tavares2022-07-142-1/+53
| * | checkout: document bug where delayed checkout counts entries twiceMatheus Tavares2022-07-141-0/+22
* | | Merge branch 'cl/rerere-train-with-no-sign'Junio C Hamano2022-08-011-1/+1
|\ \ \
| * | | contrib/rerere-train: avoid useless gpg sign in trainingCeleste Liu2022-07-191-1/+1
* | | | Merge branch 'ds/rebase-update-ref'Junio C Hamano2022-08-0110-44/+895
|\ \ \ \
| * | | | sequencer: notify user of --update-refs activityDerrick Stolee2022-07-192-10/+67
| * | | | sequencer: ignore HEAD ref under --update-refsDerrick Stolee2022-07-191-0/+13
| * | | | rebase: add rebase.updateRefs config optionDerrick Stolee2022-07-194-0/+25
| * | | | sequencer: rewrite update-refs as user edits todo listDerrick Stolee2022-07-195-0/+268
| * | | | rebase: update refs from 'update-ref' commandsDerrick Stolee2022-07-193-18/+140
| * | | | rebase: add --update-refs optionDerrick Stolee2022-07-196-0/+216
| * | | | sequencer: add update-ref commandDerrick Stolee2022-07-193-1/+17
| * | | | sequencer: define array with enum valuesDerrick Stolee2022-07-191-14/+14
| * | | | rebase-interactive: update 'merge' descriptionDerrick Stolee2022-07-191-3/+3
| * | | | branch: consider refs under 'update-refs'Derrick Stolee2022-07-194-0/+119
| * | | | t2407: test branches currently using apply backendDerrick Stolee2022-07-191-1/+11
| * | | | t2407: test bisect and rebase as black-boxesDerrick Stolee2022-07-191-26/+31
| * | | | Merge branch 'ds/branch-checked-out' into ds/rebase-update-refJunio C Hamano2022-07-125-45/+224
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch 'kk/p4-client-name-encoding-fix'Junio C Hamano2022-08-011-9/+42
|\ \ \ \ \
| * | | | | git-p4: refactoring of p4CmdList()Kilian Kilger2022-07-211-11/+42
| * | | | | git-p4: fix bug with encoding of p4 client nameKilian Kilger2022-07-081-2/+4
| |/ / / /
* | | | | Sync with 'maint'Junio C Hamano2022-07-272-22/+47
|\ \ \ \ \
| * | | | | Downmerge a handful of fixes for 2.37.x maintenance trackJunio C Hamano2022-07-272-1/+48
| * | | | | Merge branch 'tk/rev-parse-doc-clarify-at-u' into maintJunio C Hamano2022-07-271-9/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'll/ls-files-tests-update' into maintJunio C Hamano2022-07-275-71/+132
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ds/t5510-brokequote' into maintJunio C Hamano2022-07-271-1/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tb/pack-objects-remove-pahole-comment' into maintJunio C Hamano2022-07-271-10/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'en/t6429-test-must-be-empty-fix' into maintJunio C Hamano2022-07-271-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ds/vscode-settings' into maintJunio C Hamano2022-07-271-2/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cr/setup-bug-typo' into maintJunio C Hamano2022-07-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/diff-doc-raw-format' into maintJunio C Hamano2022-07-272-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/revisions-doc-markup-fix' into maintJunio C Hamano2022-07-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/combine-diff-with-incompatible-options' into maintJunio C Hamano2022-07-271-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ac/bitmap-format-doc' into maintJunio C Hamano2022-07-272-96/+108
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/test-quoting-fix' into maintJunio C Hamano2022-07-275-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ro/mktree-allow-missing-fix' into maintJunio C Hamano2022-07-271-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dr/i18n-die-warn-error-usage' into maintJunio C Hamano2022-07-271-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ds/git-rebase-doc-markup' into maintJunio C Hamano2022-07-271-120/+122
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \