git branch –set-upstream local origin/remote local and remote are the names of your local resp. remote branches. In Git version 1.8 and later, it’s even easier. Make sure you’re on the local branch, and then: git branch –set-upstream-to origin/remote
git checkout HEAD~1 This will move your current HEAD to one revision earlier. git checkout <sha> This will move your current HEAD to the given revision. Use git log or gitk to find the revision you’re looking for.
Because your commit isn’t on any branch, you can’t see it in the working directory unless you checkout that specific commit, using its SHA1. You can find the commit by looking at the reflog which tracks changes in what you have checked out from the repo. If your tag was XXX you’ll see something like: …
Yes you can push directly to your webserver, but I wouldn’t recommend it since you should only push to repositories cloned with the –bare argument. I’d utilize the Git hook system to let the main repository automatically update the repo on the web server. Check out the post-update hook in: http://git-scm.com/docs/githooks This script could in …
You need to create a fresh branch from the remote HEAD, cherry-pick the commit to that branch, push the branch to your repo on GitHub, then create a pull request. git checkout -b mybranch git fetch upstream git reset –hard upstream/master git cherry-pick <commit-hash> git push origin mybranch:mybranch
If you have remote-tracking branches set up locally, it’s as simple as: git checkout production git merge development git push origin production If you have not yet set up remote-tracking branches, you could do something like: git fetch origin git checkout production # or `git checkout -b production origin/production` if you haven’t set up production …
It’s a message from VIM which apparently you are using as the text editor in git. Have you tried reading and following these two (1) (2) points? One of them will be probably true, and will let you solve this issue. First of all, check that MERGE_MSG file (not MERGE_MSG.swp), and see if it exists …
If you go to Changelist -> Log, and there select the commit, you’ve got a change detail in the right panel. There you can select all and click a button (or right click -> revert selected changes).
The command could not save your key, likely because it was unable to determine your $HOME directory. Specify a file, at a location where you have write access: ssh-keygen -t rsa -b 4096 -C “my@emailaddress.com” -f /path/to/key This will save your private key in /path/to/key and the public key in /path/to/key.pub. When successful, instead of …
Never turn autocrlf on, it causes nothing but headaches and sorrows. There’s no excuse to use \r\n on windows, all decent editors (by definition) can handle \n.