summaryrefslogtreecommitdiff
path: root/doMerge.go
AgeCommit message (Expand)Author
2025-10-16strip out some cruftJeff Carr
2025-10-16show table. minor stuffJeff Carr
2025-10-12okayJeff Carr
2025-10-10more cleanups. shooting for better codeJeff Carr
2025-10-07remove this check finallyv0.25.67Jeff Carr
2025-10-05s/GoPath/Namespace/v0.25.57Jeff Carr
2025-10-05reorderv0.25.55Jeff Carr
2025-10-05okay now?Jeff Carr
2025-10-04start default behavior functionsJeff Carr
2025-10-04smarter logicJeff Carr
2025-10-04automate publish & mergeJeff Carr
2025-10-04mergeJeff Carr
2025-10-03merge handling .gitignore cause dirty statev0.25.46v0.25.45Jeff Carr
2025-09-22fix merge optionsv0.25.16Jeff Carr
2025-09-17common argv handlingJeff Carr
2025-09-13stuffv0.25.6Jeff Carr
2025-09-13better "ForgeMode" handlingJeff Carr
2025-09-11more stuffJeff Carr
2025-09-08always unset 'normal' on merge masterv0.22.149Jeff Carr
2025-09-07merge turns off 'normal' development modev0.22.147Jeff Carr
2025-09-07more general work for patchesJeff Carr
2025-09-06minor fixJeff Carr
2025-09-06start reporting applied patchesv0.22.144Jeff Carr
2025-09-05better outputv0.22.143Jeff Carr
2025-09-05debugging mergev0.22.142Jeff Carr
2025-09-05more patch trackingJeff Carr
2025-09-04always rewrite the pb hereJeff Carr
2025-09-04finally some sensible merge() codeJeff Carr