search

abentley / oaf

A Git client that brings a more user-friendly CLI to Git.
Apache License 2.0
9 stars 1 forks source link

merge --no-record #54

Open abentley-ssimwave opened 2 years ago

abentley-ssimwave commented 2 years ago

For some workflows, you want to backport a bunch of changes (but not all) from another branch. In this case, you must not record a merge, because that will prevent any changes you didn't backport from being merged later. git update-ref -d MERGE_HEAD will do this and is trivial to add after merge.

abentley-ssimwave commented 2 years ago

Presumably we could also re-formulate the merge command from lower-level stuff, but that seems like a hassle.