The solution for my case ended up being to simply use a wildcard in the directory path, since the files were grouped: git checkout –theirs directory_name/* git add directory_name/* This may also work, according to helios456: git checkout –theirs directory_name/.
It’s a bug in the documentation. Quote the asterisk with $ git add documentation/\*.screen or $ git add ‘documentation/*.screen’ to get the behavior you want. If instead you want to add files in the current directory only, use $ git add *.screen UPDATE: I submitted a patch that corrects the issue, now fixed as of … Read more
Have you tried git add . This recurses into sub-directories, whereas I don’t think * does. See here
For unix-like systems you can always use the star to point to files, e.g. git add *DSManager.java will include all DSManager.java files git can find within your source tree starting in your current working directory.
If you have a mix of modified and deleted files and only want to stage deleted files to the index, you can use git ls-files as a filter. git ls-files –deleted | xargs git add If you only want this to apply to part of the file tree, give one or more subdirectories as arguments … Read more
It is one of the git gotchas mentioned here (pre Git 2.0). git add . only adds what is there, not what has been deleted (if tracked). git add . git commit git status //hey! why didn’t it commit my deletes?, Oh yeah, silly me git add -u . git commit –amend git add -A … Read more
git add . adds / stages all of the files in the current directory. This is for convenience, and can still be used if you have certain files you don’t want to add by using a .gitignore A tutorial for .gitignore is located here. A deeper look into git add . vs git add -A … Read more
In #git, you said you unintentionally added a directory that should have been ignored, so run git rm –cached -r directory-name to recursively remove the tree rooted at directory-name from the index. Don’t forget to update .gitignore!
Is this like in this git-add post? Manually editing the hunk is immensely powerful, but also a bit complicated if you’ve never done it before. The most important thing to keep in mind: The diff is always indented with one character in addition to whatever other indentation is there. The character can either be: a … Read more
It has already been answered several times: You can use git reset. This will ‘unstage’ all the files you’ve added after your last commit. If you want to unstage only some files, use git reset — <file 1> <file 2> <file n>. Also it’s possible to unstage some of the changes in files by using … Read more