I have some files which were untracked in git. I made some changes and wanted to commit them, but realised I had forgotten to check in the unmodified files first. So I stashed the files, then added the unmodified versions. ...

I've pulled all remote branches via git fetch --all . I can see the branch I'd like to merge via git branch -a as remotes/origin/branchname. Problem is it is not accessible. I can't merge or checkout. ...

...d to stash them and then apply them to a new branch off of master. I used git stash pop to transfer work-in-progress changes to this new branch, forgetting that I hadn't pulled new changes into master before creating the new branch. This resulted in a bunch of merge conflicts and loss of a clean s...

Due to some bad cherry-picking, my local Git repository is currently five commits ahead of the origin, and not in a good state. I want to get rid of all these commits and start over again. ...

During the first clone of a repository, git first receives the objects (which is obvious enough), and then spends about the same amount of time "resolving deltas". What's actually happening during this phase of the clone? ...

...nd out. Here are a few things you can do. Find branches the commit is on git branch -a --contains <commit> This will tell you all branches which have the given commit in their history. Obviously this is less useful if the commit's already been merged. Search the reflogs If you are workin...

What is the proper syntax for the .gitignore file to ignore files in a directory? 10 Answers ...

... You have a project -- call it MyWebApp that already has a github repo You want to use the jquery repository in your project You want to pull the jquery repo into your project as a submodule. Submodules are really, really easy to reference and use. Assuming you already have MyWebAp...

What is the difference between git clone and git checkout ? 5 Answers 5 ...

How can I show files in Git which change most often? 9 Answers 9 ...