In the project I am working on there is a config file with some DB users and password. I want this file not to be tracked in my local machine, but if there are updates to it, I want to receive those updates from the remote.
Here is how I do it now: $ git add <file> # *all changed files except the config file with password (my password and user are different)* $ git stash # *here I stash the changes to the config file with the different password* $ git pull <branch> $ git push <branch> $git stash pop # *here I get my changes back* The config file as you can imagine is not on .gitignore, and it is not going to be, I would like to know if there is a way to avoid using stash. Thanks for any tip. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.