This is what you’re looking for: ignoring doesn’t remove a file. I suggest you read that page, but here’s the specific command to use: git filter-branch –index-filter \ ‘git rm -r –cached –ignore-unmatch <file/dir>’ HEAD Also, to remove all the deleted files from caches git creates, use: rm -rf .git/refs/original/ && \ git reflog expire … Read more
git reset HEAD Should do it. If you don’t have any uncommitted changes that you care about, then git reset –hard HEAD should forcibly reset everything to your last commit. If you do have uncommitted changes, but the first command doesn’t work, then save your uncommitted changes with git stash: git stash git reset –hard … Read more
To list untracked files try: git ls-files –others –exclude-standard If you need to pipe the output to xargs, it is wise to mind white spaces using git ls-files -z and xargs -0: git ls-files -z -o –exclude-standard | xargs -0 git add Nice alias for adding untracked files: au = !git add $(git ls-files -o … Read more
For Git 1.x $ git add -u This tells git to automatically stage tracked files — including deleting the previously tracked files. For Git 2.0 To stage your whole working tree: $ git add -u :/ To stage just the current path: $ git add -u .
Please don’t use this recipe if your situation is not the one described in the question. This recipe is for fixing a bad merge, and replaying your good commits onto a fixed merge. Although filter-branch will do what you want, it is quite a complex command and I would probably choose to do this with … Read more
Use git rm. If you want to remove the file from the Git repository and the filesystem, use: git rm file1.txt git commit -m “remove file1.txt” But if you want to remove the file only from the Git repository and not remove it from the filesystem, use: git rm –cached file1.txt git commit -m “remove … Read more
To untrack a single file that has already been added/initialized to your repository, i.e., stop tracking the file but not delete it from your system use: git rm –cached filename To untrack every file that is now in your .gitignore: First commit any outstanding code changes, and then, run this command: git rm -r –cached … Read more
From the man file: When –cached is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index. So, for a single file: git rm –cached mylogfile.log and for a single directory: git rm –cached -r mydirectory
.gitignore will prevent untracked files from being added (without an add -f) to the set of files tracked by Git, however Git will continue to track any files that are already being tracked. To stop tracking a file you need to remove it from the index. This can be achieved with this command. git rm … Read more