Catalin Marinas
Catalin Marinas
stg push and import have a --merged option but I haven't thought of doing it for import. You could import it on a base you know it would apply and...
It makes sense (I occasionally find that I need something similar, for example reworking a patch series and wanting to store some notes like changes from the previous version). The...
With this fix, I now get: "error: git apply: error: --cached and --3way cannot be used together" git version 2.30.2 (Debian stable).
Thanks for digging the git versions. I can get git 2.34 from bullseye-backports and solve it for me but it may affect others that prefer to stick to vanilla Debian...