Update git detection in order to work when in middle of failed merge or
rebase.
Allows rc to recover from failed rebase and to continue rebase on next run.
Merge pull request #7 from wjdix/master

rake_commit handles failed pull --rebase better