JS> Perhaps this one:
JS> git merge origin/master
JS> git rebase ORIG_HEAD
JS> -- Hannes
Wouldn't I have to resolve conflicts twice?
BTW, during the rebase, can I tell git to rewrite a different branch
upon rebase success or abort?
git branch -f tmp origin/master
git rebase --onto master master tmp
if [ $? -ne 0 ]; then
# modify some file in .git/ ?
else
git branch -f master
git checkout master
fi
--
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
