git stash push -p -m “my commit message” -p let’s you select the hunks that should be stashed; whole files can be selected as well. You’ll be prompted with a few actions for each hunk: y – stash this hunk n – do not stash this hunk q – quit; do not stash this hunk … Read more
The git rm documentation states: When –cached is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index. So, for a single file: git rm –cached file_to_remove.txt and for a single directory: git rm –cached -r directory_to_remove
This lets Git generate the patches for each log entry: git log -p — filename See git help log for more options — it can actually do a lot of nice things. 🙂 To get just the diff for a specific commit, use git show HEAD or specify any other revision by identifier. To browse … Read more
Update 2020 / Git 2.23 Git 2.23 adds the new switch subcommand in an attempt to clear some of the confusion that comes from the overloaded usage of checkout (switching branches, restoring files, detaching HEAD, etc.) Starting with this version of Git, replace the checkout command with: git switch -c <new-branch> The behavior is identical … Read more
git clone -b <branch> <remote_repo> Example: git clone -b my-branch git@github.com:user/myproject.git With Git 1.7.10 and later, add –single-branch to prevent fetching of all branches. Example, with OpenCV 2.4 branch: git clone -b opencv-2.4 –single-branch https://github.com/Itseez/opencv.git
Maybe you just need to commit. I ran into this when I did: mkdir repo && cd repo git remote add origin /path/to/origin.git git add . Oops! Never committed! git push -u origin master error: src refspec master does not match any. All I had to do was: git commit -m “initial commit” git push … Read more
Given a branch foo and a remote upstream: As of Git 1.8.0: git branch -u upstream/foo Or, if local branch foo is not the current branch: git branch -u upstream/foo foo Or, if you like to type longer commands, these are equivalent to the above two: git branch –set-upstream-to=upstream/foo git branch –set-upstream-to=upstream/foo foo As of … Read more
The easiest way would be to find the head commit of the branch as it was immediately before the rebase started in the reflog… git reflog and to reset the current branch to it (with the usual caveats about being absolutely sure before reseting with the –hard option). Suppose the old commit was HEAD@{2} in … Read more
Careful: git reset –hard WILL DELETE YOUR WORKING DIRECTORY CHANGES. Be sure to stash any local changes you want to keep before running this command. Assuming you are sitting on that commit, then this command will wack it… git reset –hard HEAD~1 The HEAD~1 means the commit before head. Or, you could look at the … Read more