Reputation: 12189
How can I find commits in the central/master branch that were rebased? I thought it might be handy to be able to see commits that are the result of resolved merge conflicts during a rebase pull.
Example:
local branch ahead of master x amount of commits
git pull --rebase origin master
conflicts found in file.txt
edit file
git add file.txt
git rebase --continue
rebased
git push
Now I want to look at the master branch and see which commits needed resolution before being pushed.
Upvotes: 0
Views: 2348
Reputation: 327
You can try git reflog
, more reference https://git-scm.com/docs/git-reflog
Upvotes: 3