How do I select a merge strategy for a git rebase?

by

You can use this with Git v1.7.3 or later versions.

git rebase --strategy-option theirs ${branch} # Long option
git rebase -X theirs ${branch} # Short option

(which is a short for git rebase --strategy recursive --strategy-option theirs ${branch} as stated by the documentation)

From Git v1.7.3 Release Notes:

git rebase --strategy <s> learned the --strategy-option/-X option to pass extra options that are understood by the chosen merge strategy.

NB: “Ours” and “theirs” mean the opposite of what they do during a straight merge. In other words, “theirs” favors the commits on the current branch.

More Related Contents:

  1. Undoing a git rebase
  2. How to cherry-pick multiple commits
  3. How to squash all git commits into one?
  4. What’s the difference between ‘git merge’ and ‘git rebase’?
  5. Combine the first two commits of a Git repository?
  6. Remove folder and its contents from git/GitHub’s history
  7. How do I run git rebase –interactive in non-interactive manner?
  8. git rebase without changing commit timestamps
  9. Rebasing a branch including all its children
  10. How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?
  11. How to inject a commit between some two arbitrary commits in the past?
  12. Rebasing a Git merge commit
  13. How do I delete a commit from a branch?
  14. Squash the first two commits in Git? [duplicate]
  15. What are the practical consequences of rewriting Git history?
  16. git rebase basics
  17. When git rebasing two branches with some shared history, is there an easy way to have the common history remain common?
  18. How to identify conflicting commits by hash during git rebase?
  19. Change old commit message using `git rebase`
  20. What is the difference between git pull and git fetch + git rebase?
  21. Rebase feature branch onto another feature branch
  22. Your branch is ahead of ‘origin/master’ by 3 commits
  23. How do I git rebase the first commit?
  24. Git interactive rebase without opening the editor
  25. git rebase: “error: cannot stat ‘file’: Permission denied”
  26. Git: How to rebase to a specific commit?
  27. Git rebase branch with all parent branches (or dependent sub-branches)
  28. What does “Auto packing the repository for optimum performance” mean?
  29. How to retain commit gpg-signature after interactive rebase squashing?
  30. Can tags be automatically moved after a git filter-branch and rebase?

Leave a Comment