summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles2024-03-265-9/+133
* cherry-pick: enforce `--keep-redundant-commits` incompatibilityBrian Lyles2024-03-262-0/+15
* sequencer: do not require `allow_empty` for redundant commit optionsBrian Lyles2024-03-261-16/+7
* sequencer: handle unborn branch with `--allow-empty`Brian Lyles2024-03-262-18/+39
* rebase: update `--empty=ask` to `--empty=stop`Brian Lyles2024-03-263-18/+34
* docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)Brian Lyles2024-03-262-16/+29
* docs: address inaccurate `--empty` default with `--exec`Brian Lyles2024-03-262-5/+43
* The fifth batchJunio C Hamano2024-03-081-0/+34
* Merge branch 'jk/upload-pack-v2-capability-cleanup'Junio C Hamano2024-03-082-32/+45
|\
| * upload-pack: only accept packfile-uris if we advertised itJeff King2024-02-292-9/+26
| * upload-pack: use existing config mechanism for advertisementJeff King2024-02-291-16/+10
| * upload-pack: centralize setup of sideband-all configJeff King2024-02-291-2/+3
| * upload-pack: use repository struct to get configJeff King2024-02-281-5/+6
* | Merge branch 'jk/upload-pack-bounded-resources'Junio C Hamano2024-03-0810-73/+113
|\ \
| * | upload-pack: free tree buffers after parsingJeff King2024-02-284-4/+23
| * | upload-pack: use PARSE_OBJECT_SKIP_HASH_CHECK in more placesJeff King2024-02-281-2/+4
| * | upload-pack: always turn off save_commit_bufferJeff King2024-02-282-2/+2
| * | upload-pack: disallow object-info capability by defaultTaylor Blau2024-02-284-3/+40
| * | upload-pack: accept only a single packfile-uri lineJeff King2024-02-282-1/+5
| * | upload-pack: use a strmap for want-ref linesJeff King2024-02-282-14/+19
| * | upload-pack: use oidset for deepen_not listJeff King2024-02-281-10/+11
| * | upload-pack: switch deepen-not list to an oid_arrayJeff King2024-02-281-7/+7
| * | upload-pack: drop separate v2 "haves" arrayJeff King2024-02-281-38/+10
| |/
* | Merge branch 'ps/reftable-repo-init-fix'Junio C Hamano2024-03-082-0/+13
|\ \
| * | t0610: remove unused variable assignmentPatrick Steinhardt2024-03-061-1/+0
| * | refs/reftable: don't fail empty transactions in repo without HEADPatrick Steinhardt2024-02-272-0/+14
| * | Merge branch 'ps/remote-helper-repo-initialization-fix' into ps/reftable-repo...Junio C Hamano2024-02-273-1/+59
| |\ \
* | \ \ Merge branch 'ps/remote-helper-repo-initialization-fix'Junio C Hamano2024-03-083-1/+59
|\ \ \ \ | | |/ / | |/| |
| * | | builtin/clone: allow remote helpers to detect repoPatrick Steinhardt2024-02-273-1/+59
| | |/ | |/|
* | | Merge branch 'ml/log-merge-with-cherry-pick-and-other-pseudo-heads'Junio C Hamano2024-03-082-6/+28
|\ \ \
| * | | revision: implement `git log --merge` also for rebase/cherry-pick/revertMichael Lohmann2024-02-282-10/+28
| * | | revision: ensure MERGE_HEAD is a ref in prepare_show_mergeMichael Lohmann2024-02-281-1/+5
* | | | Merge branch 'eg/add-uflags'Junio C Hamano2024-03-081-1/+1
|\ \ \ \
| * | | | add: use unsigned type for collection of bitsEugenio Gigante2024-02-291-1/+1
* | | | | Merge branch 'jt/commit-redundant-scissors-fix'Junio C Hamano2024-03-084-12/+20
|\ \ \ \ \
| * | | | | commit: unify logic to avoid multiple scissors lines when mergingJosh Triplett2024-02-271-5/+3
| * | | | | commit: avoid redundant scissor line with --cleanup=scissors -vJosh Triplett2024-02-274-7/+17
| |/ / / /
* | | | | Merge branch 'js/merge-tree-3-trees'Junio C Hamano2024-03-0816-35/+124
|\ \ \ \ \
| * | | | | fill_tree_descriptor(): mark error message for translationJohannes Schindelin2024-02-232-2/+2
| * | | | | cache-tree: avoid an unnecessary checkJohannes Schindelin2024-02-231-1/+1
| * | | | | Always check `parse_tree*()`'s return valueJohannes Schindelin2024-02-2312-10/+52
| * | | | | t4301: verify that merge-tree fails on missing blob objectsJohannes Schindelin2024-02-231-0/+16
| * | | | | merge-ort: do check `parse_tree()`'s return valueJohannes Schindelin2024-02-231-2/+4
| * | | | | merge-tree: fail with a non-zero exit code on missing tree objectsJohannes Schindelin2024-02-232-3/+15
| * | | | | merge-tree: accept 3 trees as argumentsJohannes Schindelin2024-01-293-18/+35
* | | | | | Merge branch 'cc/rev-list-allow-missing-tips'Junio C Hamano2024-03-087-19/+129
|\ \ \ \ \ \
| * | | | | | revision: fix --missing=[print|allow*] for annotated tagsChristian Couder2024-02-282-7/+25
| * | | | | | rev-list: allow missing tips with --missing=[print|allow*]Christian Couder2024-02-144-4/+88
| * | | | | | t6022: fix 'test' style and 'even though' typoChristian Couder2024-02-141-2/+3
| * | | | | | oidset: refactor oidset_insert_from_set()Christian Couder2024-02-143-10/+17
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 11:48:23 +0100