.gitignore tells git which files (or patterns) it should ignore. It’s usually used to avoid committing transient files from your working directory that aren’t useful to other collaborators, such as compilation products, temporary files IDEs create, etc. You can find the full details here.
I am going through some Git tutorials. The concept of a “working directory” keeps being mentioned, however, none of the tutorials or documents I read points out where or what this “working directory” is. I have thought that it was actually the .git‘s parent directory, a.k.a the directory I run git init in. But the … Read more
git pull wants you to either remove or save your current work so that the merge it triggers doesn’t cause conflicts with your uncommitted work. Note that you should only need to remove/save untracked files if the changes you’re pulling create files in the same locations as your local uncommitted files. Remove your uncommitted changes … Read more
I have made several commits on different files, but so far I would like to push to my remote repository only a specific commit. Is that possible?
You can use git rebase. For example, if you want to modify commit bbc643cd, run Please note the caret ^ at the end of the command, because you need actually to rebase back to the commit before the one you wish to modify. In the default editor, modify pick to edit in the line mentioning ‘bbc643cd’. Save the file and exit: git will interpret and automatically … Read more
Situation: You have local uncommitted changes You pull from the master repo You get the error “Checkout conflict with files: xy” Solution: Stage and commit (at least) the files xy Pull again If automerge is possible, everything is ok. If not, the pull merges the files and inserts the merge-conflict markers (<<<<<<, >>>>) Manually edit … Read more
Wow, that was easier than I thought:
I think that Git on Dropbox is great. I use it all the time. I have multiple computers (two at home and one at work) on which I use Dropbox as a central bare repository. Since I don’t want to host it on a public service, and I don’t have access to a server that … Read more
From the git docs: Running git init in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning git init is to pick up newly added templates.
You can stash (save the changes in temporary box) then, back to master branch HEAD. Jump Over Commits Back and Forth: Go to a specific commit-sha. $ git checkout <commit-sha> If you have uncommitted changes here then, you can checkout to a new branch | Add | Commit | Push the current branch to the remote. # checkout a new … Read more