git-track

I'm new to Git. I wish to know what are tracked and untracked files? I read "Pro Git", but still couldn't quite understand. Can someone explain to me the difference between the two by providing an example? A file is tracked if it is under version control. As a small example, a C++ project would have Makefile main.cpp interface.hpp worker.cpp as source files; you'd put these under version control. During build, main.o worker.o myapp are generated; these do not belong under version control, so you do not use git add on them. They remain untracked , because git does not care what happens to them.

We have a config file in the repo which all the users contribute to based on their function. For my local testing, I need to manually change two values in that config file, but I never want my changes committed back to the server. I do however want to pull updates to the file if there's a newer version in the repo, even if that means my local changes will be overwritten. That's fine, I can just make them again from a stash I created specifically to do exactly that. What I'm wondering is if I can tell Git "Hey... I will never push back my local changes to the server, so don't show it to me as

How do you stop tracking a remote branch in Git ? I am asking to stop tracking because in my concrete case, I want to delete the local branch, but not the remote one. Deleting the local one and pushing the deletion to remote will delete the remote branch as well: How do I delete a Git branch both locally and in GitHub? Can I just do git branch -d the_branch , and it won't get propagated when I later git push ? Will it only propagate if I were to run git push origin :the_branch later on? VonC As mentioned in Yoshua Wuyts ' answer , using git branch : git branch --unset-upstream Other options: