Before version 1.8.2, ** didn’t have any special meaning in the .gitignore. As of 1.8.2 git supports ** to mean zero or more sub-directories (see release notes). The way to ignore all directories called bin anywhere below the current level in a directory tree is with a .gitignore file with the pattern: bin/ In the … Read more
git stash pop throws away the (topmost, by default) stash after applying it, whereas git stash apply leaves it in the stash list for possible later reuse (or you can then git stash drop it). This happens unless there are conflicts after git stash pop, in which case it will not remove the stash, leaving … Read more
Create a file named .gitignore in your project’s directory. Ignore directories by entering the directory name into the file (with a slash appended): dir_to_ignore/ More information is here.
Here is how I rename a tag old to new: git tag new old git tag -d old git push origin new :old The colon in the push command removes the tag from the remote repository. If you don’t do this, Git will create the old tag on your machine when you pull. Finally, make … Read more
Expanding what I wrote in a comment The general rule is that you should not rewrite (change) history that you have published, because somebody might have based their work on it. If you rewrite (change) history, you would make problems with merging their changes and with updating for them. So the solution is to create … Read more
In Jan 2013, Microsoft announced that they are adding full Git support into all their ALM products. They have published a plugin for Visual Studio 2012 that adds Git source control integration. Alternatively, there is a project called Git Extensions that includes add-ins for Visual Studio 2005, 2008, 2010 and 2012, as well as Windows … Read more
You can use: git config –list or look at your ~/.gitconfig file. The local configuration will be in your repository’s .git/config file. Use: git config –list –show-origin to see where that setting is defined (global, user, repo, etc…)
Pat Notz is correct. You can get the commit back so long as it’s been within a few days. git only garbage collects after about a month or so unless you explicitly tell it to remove newer blobs. $ git init Initialized empty Git repository in .git/ $ echo “testing reset” > file1 $ git … Read more
The problem is your previous pull failed to merge automatically and went to conflict state. And the conflict wasn’t resolved properly before the next pull. Undo the merge and pull again. To undo a merge: git merge –abort [Since git version 1.7.4] git reset –merge [prior git versions] Resolve the conflict. Don’t forget to add … Read more
You can control the default behavior by setting push.default in your git config. From the git-config(1) documentation: push.default Defines the action git push should take if no refspec is given on the command line, no refspec is configured in the remote, and no refspec is implied by any of the options given on the command … Read more