gistfile1.txt

rebase基本用法:
http://git-scm.com/book/en/Git-Branching-Rebasing
git co xxx
git rebase master : patch modification of xxx on base of master branch

rebase远程分支:
http://stackoverflow.com/questions/7929369/how-to-rebase-local-branch-with-remote-master
1.
>git fetch origin
>git rebase origin/master
2.
>git pull --rebase origin/master

### ignore

Fortunately GIT has a very easy solution for this, just run the following command on the file or path you want to ignore the changes of:

git update-index --assume-unchanged <file>

If you wanna start tracking changes again run the following command:

git update-index --no-assume-unchanged <file>