Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge options: add a conflict style member | Phillip Wood | 2024-03-14 | 1 | -1/+3 |
* | merge-ll: introduce LL_MERGE_OPTIONS_INIT | Phillip Wood | 2024-03-14 | 1 | -1/+1 |
* | merge-ll: expose revision names to custom drivers | Antonin Delpeuch | 2024-01-24 | 1 | -3/+14 |
* | config: use config_error_nonbool() instead of custom messages | Jeff King | 2023-12-09 | 1 | -1/+1 |
* | Merge branch 'cw/compat-util-header-cleanup' | Junio C Hamano | 2023-07-17 | 1 | -1/+0 |
|\ | |||||
| * | treewide: remove unnecessary includes for wrapper.h | Calvin Wan | 2023-07-05 | 1 | -1/+0 |
* | | Merge branch 'gc/config-context' | Junio C Hamano | 2023-07-06 | 1 | -0/+1 |
* | | Merge branch 'rs/strbuf-expand-step' | Junio C Hamano | 2023-07-06 | 1 | -15/+18 |
|/ | |||||
* | Merge branch 'jc/abort-ll-merge-with-a-signal' | Junio C Hamano | 2023-06-30 | 1 | -1/+8 |
* | merge-ll: rename from ll-merge | Elijah Newren | 2023-06-21 | 1 | -0/+432 |