CODEWITHSUNDEEP
git
Aleksander Lech
Aleksander Lech

Reputation: 1335

How to get next commit to apply when using git rebase?

I am now in the middle of branch rebase (conflicts stage) and I want to skip some commits using git rebase --skip. However I am wondering how to check what commit is actually being applied to the workspace (the conflicting one). Is there a simple way to do this? Google did not help this time.

Upvotes: 2

Views: 142

Answers (1)

krichprollsch
krichprollsch

Reputation: 391

Look at the file .git/rebase-apply/original-commit which should contains the hash of the commit which generates the conflict.

Upvotes: 4

Related Questions