limit the check of the local tree only to tracked files
Merge pull request #66 from fwyzard/check-status-before-merge-v2

limit the check of the local tree only to tracked files