These files contain user preference configurations that are in general specific to your machine, so it’s better not to put it in SCM. Also, VS will change it almost every time you execute it, so it will always be marked by the SCM as ‘changed’. I don’t include either, I’m in a project using VS … Read more
I was previously using the top-voted answer, but it needs a bit of cleanup, so here it is redone for Xcode 4, with some improvements. I’ve researched every file in this list, but several of them do not exist in Apple’s official Xcode documentation, so I had to go on Apple mailing lists. Apple continues … Read more
Identify the hash of the commit, using git log, then use git revert <commit> to create a new commit that removes these changes. In a way, git revert is the converse of git cherry-pick — the latter applies the patch to a branch that’s missing it, the former removes it from a branch that has … Read more
Use the BFG Repo-Cleaner, a simpler, faster alternative to git-filter-branch specifically designed for removing unwanted files from Git history. Carefully follow the usage instructions, the core part is just this: $ java -jar bfg.jar –strip-blobs-bigger-than 100M my-repo.git Any files over 100MB in size (that aren’t in your latest commit) will be removed from your Git … Read more
Command to use: git config –global http.proxy http://proxyuser:proxypwd@proxy.server.com:8080 change proxyuser to your proxy user change proxypwd to your proxy password change proxy.server.com to the URL of your proxy server change 8080 to the proxy port configured on your proxy server Note that this works for both http and https repos. If you decide at any … Read more
The .gitignore file should be in your repository, so it should indeed be added and committed in, as git status suggests. It has to be a part of the repository tree, so that changes to it can be merged and so on. So, add it to your repository, it should not be gitignored. If you … Read more
In terms of source control, you’re downstream when you copy (clone, checkout, etc) from a repository. Information flowed “downstream” to you. When you make changes, you usually want to send them back “upstream” so they make it into that repository so that everyone pulling from the same source is working with all the same changes. … Read more
TL;DR A git rebase workflow does not protect you from people who are bad at conflict resolution or people who are used to a SVN workflow, like suggested in Avoiding Git Disasters: A Gory Story. It only makes conflict resolution more tedious for them and makes it harder to recover from bad conflict resolution. Instead, … Read more
When you modify a file in your repository, the change is initially unstaged. In order to commit it, you must stage it—that is, add it to the index—using git add. When you make a commit, the changes that are committed are those that have been added to the index. git reset changes, at minimum, where … Read more
Example: git tag -a v1.2 9fceb02 -m “Message here” Where 9fceb02 is the beginning part of the commit id. You can then push the tag using git push origin v1.2. You can do git log to show all the commit id’s in your current branch. There is also a good chapter on tagging in the … Read more