When performing a large rebase with several commits and many changed files on OS X 10.7+, the rebase process can randomly abort, stating that there are uncommitted changes and rebase cannot continue. However, a
git status
does not report any changes.
Fix is to set core.trustctime
to false
. Run the command below to do so:
git config --global core.trustctime false
Detailed explanation: A Simple Tweak for Making ‘git rebase’ Safe on OS X →