Fix detection for rebase in progress
Merge pull request #26 from phatblat/pull/rebase-marker-fix

Fix detection for rebase in progress