You can do this to work around using following steps
1. stash your changes with: git stash
2. pull from master with rebase: git pull –rebase
3. Then execute simpler git stash pop. With this command, it deletes that stash for good, while apply does not.
Here I have used git stash pop but After changes have been stashed, there are a few options of to get changes back to local:
1. git stash pop: This command takes a stashed change and removes changes from the stash stack and apply it to your current working tree.
2. git stash applies : This command takes a stashed change and applies it to your current working tree. You need to delete stash stack using git stash drop .
3. git stash branch: This command creates a new branch from the same commit you were on when you stashed the changes and applies the stashed changes to the new branch.
Experiment with the stash before using it on some really important work
http://www.thecreativedev.com/solutioncannot-pull-with-rebase-you-have-unstaged-changes-in-github/