search

jakub-g / dotfiles

:heavy_dollar_sign: Lots of aliases, mostly git-related
https://gist.github.com/jakub-g
2 stars 0 forks source link

git rebase show diff #19

Open jakub-g opened 1 year ago

jakub-g commented 1 year ago

during a rebase conflict, show the diff of the commit that git is currently trying to apply: $ git log -p -1 REBASE_HEAD

jakub-g commented 1 year ago

during a rebase conflict, show the diff between the upstream state that git is trying to apply to, and the upstream state you originally wrote the commit against: git diff REBASE_HEAD~1..HEAD -- <path/to/conflicted/file>