See the git-pull man page: git pull [options] [<repository> [<refspec>…]] and in the examples section: Merge into the current branch the remote branch next: $ git pull origin next So I imagine you want to do something like: To set it up so that it does this by default while you’re on the dev branch:
From the git-diff manpage: For instance, to see the difference for a file “main.c” between now and two commits back, here are three equivalent commands:
Git keeps all of its files in the .git directory. Just remove that one and init again. If you can’t find it, it’s because it is hidden. In Windows 7, you need to go to your folder, click on Organize on the top left, then click on Folder and search options, then click on the View tab and click on the Show hidden … Read more
GitHub has a nice section called “Dealing with “non-fast-forward” errors“ This error can be a bit overwhelming at first, do not fear.Simply put, git cannot make the change on the remote without losing commits, so it refuses the push.Usually this is caused by another user pushing to the same branch. You can remedy this by … Read more
Given a branch foo and a remote upstream: As of Git 1.8.0: Or, if local branch foo is not the current branch: Or, if you like to type longer commands, these are equivalent to the above two: As of Git 1.7.0 (before 1.8.0): Notes: All of the above commands will cause local branch foo to track remote branch foo from remote upstream. The old (1.7.x) … Read more
Try deleting index.lock file in your .git directory. rm -f .git/index.lock Such problems generally occur when you execute two git commands simultaneously; maybe one from the command prompt and one from an IDE.
git rev-parse is an ancillary plumbing command primarily used for manipulation. One common usage of git rev-parse is to print the SHA1 hashes given a revision specifier. In addition, it has various options to format this output such as –short for printing a shorter unique SHA1. There are other use cases as well (in scripts and other tools built on top of … Read more
Moving to an existing branch If you want to move your commits to an existing branch, it will look like this: You can store uncommitted edits to your stash before doing this, using git stash. Once complete, you can retrieve the stashed uncommitted edits with git stash pop Moving to a new branch WARNING: This method works because you … Read more
First, checkout to your Branch3: Then merge the Branch1: And if you want the updated commits of Branch1 on Branch2, you are probaly looking for git rebase This will update your Branch2 with the latest updates of Branch1.
You should really have a workflow that lets you do this all by merging: So all you have to do is git checkout v2.1 and git merge wss. If for some reason you really can’t do this, and you can’t use git rebase to move your wss branch to the right place, the command to grab a single commit from … Read more