Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | builtin/diagnose.c: create 'git diagnose' builtin | Victoria Dye | 2022-08-12 | 7 | -0/+143 |
* | diagnose.c: add option to configure archive contents | Victoria Dye | 2022-08-12 | 3 | -10/+39 |
* | scalar-diagnose: move functionality to common location | Victoria Dye | 2022-08-12 | 4 | -200/+227 |
* | scalar-diagnose: move 'get_disk_info()' to 'compat/' | Victoria Dye | 2022-08-12 | 3 | -52/+58 |
* | scalar-diagnose: add directory to archiver more gently | Victoria Dye | 2022-08-12 | 1 | -2/+8 |
* | scalar-diagnose: avoid 32-bit overflow of size_t | Victoria Dye | 2022-08-12 | 1 | -1/+1 |
* | scalar-diagnose: use "$GIT_UNZIP" in test | Victoria Dye | 2022-08-12 | 1 | -4/+4 |
* | The eighth batch | Junio C Hamano | 2022-08-01 | 1 | -0/+16 |
* | Merge branch 'mt/pkt-line-comment-tweak' | Junio C Hamano | 2022-08-01 | 1 | -8/+8 |
|\ | |||||
| * | pkt-line.h: move comment closer to the associated code | Matheus Tavares | 2022-07-22 | 1 | -8/+8 |
* | | Merge branch 'mt/checkout-count-fix' | Junio C Hamano | 2022-08-01 | 10 | -24/+113 |
|\ \ | |||||
| * | | checkout: fix two bugs on the final count of updated entries | Matheus Tavares | 2022-07-14 | 9 | -25/+40 |
| * | | checkout: show bug about failed entries being included in final report | Matheus Tavares | 2022-07-14 | 2 | -1/+53 |
| * | | checkout: document bug where delayed checkout counts entries twice | Matheus Tavares | 2022-07-14 | 1 | -0/+22 |
* | | | Merge branch 'cl/rerere-train-with-no-sign' | Junio C Hamano | 2022-08-01 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | contrib/rerere-train: avoid useless gpg sign in training | Celeste Liu | 2022-07-19 | 1 | -1/+1 |
* | | | | Merge branch 'ds/rebase-update-ref' | Junio C Hamano | 2022-08-01 | 10 | -44/+895 |
|\ \ \ \ | |||||
| * | | | | sequencer: notify user of --update-refs activity | Derrick Stolee | 2022-07-19 | 2 | -10/+67 |
| * | | | | sequencer: ignore HEAD ref under --update-refs | Derrick Stolee | 2022-07-19 | 1 | -0/+13 |
| * | | | | rebase: add rebase.updateRefs config option | Derrick Stolee | 2022-07-19 | 4 | -0/+25 |
| * | | | | sequencer: rewrite update-refs as user edits todo list | Derrick Stolee | 2022-07-19 | 5 | -0/+268 |
| * | | | | rebase: update refs from 'update-ref' commands | Derrick Stolee | 2022-07-19 | 3 | -18/+140 |
| * | | | | rebase: add --update-refs option | Derrick Stolee | 2022-07-19 | 6 | -0/+216 |
| * | | | | sequencer: add update-ref command | Derrick Stolee | 2022-07-19 | 3 | -1/+17 |
| * | | | | sequencer: define array with enum values | Derrick Stolee | 2022-07-19 | 1 | -14/+14 |
| * | | | | rebase-interactive: update 'merge' description | Derrick Stolee | 2022-07-19 | 1 | -3/+3 |
| * | | | | branch: consider refs under 'update-refs' | Derrick Stolee | 2022-07-19 | 4 | -0/+119 |
| * | | | | t2407: test branches currently using apply backend | Derrick Stolee | 2022-07-19 | 1 | -1/+11 |
| * | | | | t2407: test bisect and rebase as black-boxes | Derrick Stolee | 2022-07-19 | 1 | -26/+31 |
| * | | | | Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref | Junio C Hamano | 2022-07-12 | 5 | -45/+224 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'kk/p4-client-name-encoding-fix' | Junio C Hamano | 2022-08-01 | 1 | -9/+42 |
|\ \ \ \ \ | |||||
| * | | | | | git-p4: refactoring of p4CmdList() | Kilian Kilger | 2022-07-21 | 1 | -11/+42 |
| * | | | | | git-p4: fix bug with encoding of p4 client name | Kilian Kilger | 2022-07-08 | 1 | -2/+4 |
| |/ / / / | |||||
* | | | | | Sync with 'maint' | Junio C Hamano | 2022-07-27 | 2 | -22/+47 |
|\ \ \ \ \ | |||||
| * | | | | | Downmerge a handful of fixes for 2.37.x maintenance track | Junio C Hamano | 2022-07-27 | 2 | -1/+48 |
| * | | | | | Merge branch 'tk/rev-parse-doc-clarify-at-u' into maint | Junio C Hamano | 2022-07-27 | 1 | -9/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'll/ls-files-tests-update' into maint | Junio C Hamano | 2022-07-27 | 5 | -71/+132 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ds/t5510-brokequote' into maint | Junio C Hamano | 2022-07-27 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'tb/pack-objects-remove-pahole-comment' into maint | Junio C Hamano | 2022-07-27 | 1 | -10/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'en/t6429-test-must-be-empty-fix' into maint | Junio C Hamano | 2022-07-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ds/vscode-settings' into maint | Junio C Hamano | 2022-07-27 | 1 | -2/+6 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'cr/setup-bug-typo' into maint | Junio C Hamano | 2022-07-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pb/diff-doc-raw-format' into maint | Junio C Hamano | 2022-07-27 | 2 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/revisions-doc-markup-fix' into maint | Junio C Hamano | 2022-07-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/combine-diff-with-incompatible-options' into maint | Junio C Hamano | 2022-07-27 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ac/bitmap-format-doc' into maint | Junio C Hamano | 2022-07-27 | 2 | -96/+108 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/test-quoting-fix' into maint | Junio C Hamano | 2022-07-27 | 5 | -7/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ro/mktree-allow-missing-fix' into maint | Junio C Hamano | 2022-07-27 | 1 | -2/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dr/i18n-die-warn-error-usage' into maint | Junio C Hamano | 2022-07-27 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ds/git-rebase-doc-markup' into maint | Junio C Hamano | 2022-07-27 | 1 | -120/+122 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |