git pull forced with exceptions

Question

I want to do automatic(no manual intervention) git pull from git remote repository.

But that some files are kept in local state and all others are same as in remote repository.

The solution from that answer is:

git fetch --all

git reset --hard origin/master

But this is overwriting all files in the local directory to state from origin/master.

How can I do this, but with excluding some files?

More info: I am making one deployment script (I know that fabric/git is not the best solution, but if I can do this than it is good enough for me.)

Maybe was answerd here already https://stackoverflow.com/questions/19216411/how-do-i-pull-files-from-remote-without-overwriting-local-files — Stefan F., Dec 06 '17 at 15:57
@StefanF. thank you. By doing `git stash; git fetch; git reset --hard; git stash pop` look like it is doing what I want. — WebOrCode, Dec 06 '17 at 16:38
@WebOrCode You can write the commands as an answer and mark it. — Marina Liu, Dec 15 '17 at 09:18

score 0 · Accepted Answer · answered Dec 15 '17 at 19:16

0

This is what I use in my fabric script:

run('git stash') 
run('git fetch') 
run('git reset --hard origin/master') 
run('git stash pop')

answered Dec 15 '17 at 19:16

WebOrCode

1 Answers1