0

This is my scenario:

  • My branch is rebased against some other branch
  • that other branch changed and I want to get mine back to sync
  • I do a rebase and magit makes me go through all commits and merge

In terminal I would do this with a git rebase -X ours root-branch. Is something like that possible with magit? If that's not possible, is there some alternative for what I'm trying to achieve?

1 Answer 1

1

That wasn't available yet, but I've just added it with 46b2f6e3a.

Because this should only be used if you know what you are doing, it is hidden by default. To learn how to reveal it, see Enabling and Disabling Suffixes.

3
  • Thank you very much. Unfortunately I don't have enough reputation to give an upvote.
    – Djole
    Dec 5, 2020 at 12:13
  • You are welcome! You should accept the answer by clicking on tick mark thingy.
    – tarsius
    Dec 5, 2020 at 12:17
  • Thanks for that advice also, I didn't know that is clickable!
    – Djole
    Dec 5, 2020 at 13:08

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.

Not the answer you're looking for? Browse other questions tagged or ask your own question.