Selecting merge strategy options for git rebase
Posted
by porneL
on Stack Overflow
See other posts from Stack Overflow
or by porneL
Published on 2010-05-31T18:33:46Z
Indexed on
2010/05/31
18:43 UTC
Read the original article
Hit count: 351
git
|git-rebase
git-rebase
man page mentions -X<option>
can be passed to git-merge
. When/how exactly?
I'd like to rebase by applying patches with recursive strategy and theirs option (apply whatever sticks, rather than skipping entire conflicting commits). I don't want merge, I want to make history linear.
I've tried:
git rebase -Xtheirs
and
git rebase -s 'recursive -Xtheirs'
but git rejects -X
in both cases.
© Stack Overflow or respective owner