Git - jakestanley/dotfiles GitHub Wiki
git fuck fuck fuck fuck
I need to unfuck a branch with so many line ending changes:
git rebase -s recursive -X theirs --whitespace=fix dbbddad
where dbbddad is the commit you want to rebase/fix from
I need to unfuck a branch with so many line ending changes:
git rebase -s recursive -X theirs --whitespace=fix dbbddad
where dbbddad is the commit you want to rebase/fix from