The Short Answer As long as you’re doing a fast-forward merge, then you can simply use git fetch <remote> <sourceBranch>:<destinationBranch> Examples: # Merge local branch foo into local branch master, # without having to checkout master first. # Here `.` means to use the local repository as the “remote”: git fetch . foo:master # Merge … Read more
Five possibilities exist to set up a repository for pull from: local filesystem: git clone /path/to/repo or git clone file://path/to/repo. Least work if you have networked filesystem, but not very efficient use of network. (This is almost exactly solution proposed by Joakim Elofsson) HTTP protocols: git clone http://example.com/repo. You need any web server, and you … Read more
In git 1.7.10, the git developers decided merge commits could be made too easily. As explained in this blog post, forcing the interactive commit message behavior should make those commit messages more detailed and could reduce the overall frequency of unnecessary merges. You can use the –no-edit flag to avoid this behavior, but, well, don’t. … Read more
Read the warning carefully. The new default prohibition is only on pushing to the currently checked out branch in a non-bare repository. It is perfectly OK to push to any other branch in a non-bare repository. The reason for this is that the push process has no direct access to the working tree so the … Read more
git pull origin pull/28/head Or git fetch origin pull/28/head:28 git checkout 28 Can I pull a not-yet-merged pull request?
Follow the steps to setup SSH keys here: https://help.github.com/articles/generating-ssh-keys OR git remote add origin https://{username}:{password}@github.com/{username}/project.git Update: If you get “fatal: remote origin already exists.” then you have to use set-url: git remote set-url origin https://{username}:{password}@github.com/{username}/project.git
git pull calls git fetch with the appropriate parameters before merging the explicitly fetched heads (or if none the remote branch configured for merge) into the current branch. The syntax: git fetch <repository> <ref> where <ref> is just a branch name with no colon is a ‘one shot’ fetch that doesn’t do a standard fetch … Read more
Summary By default, git pull creates merge commits which add noise and complexity to the code history. In addition, pull makes it easy to not think about how your changes might be affected by incoming changes. The git pull command is safe so long as it only performs fast-forward merges. If git pull is configured … Read more
The git submodule update command actually tells Git that you want your submodules to each check out the commit already specified in the index of the superproject. If you want to update your submodules to the latest commit available from their remote, you will need to do this directly in the submodules. So in summary: … Read more
Quick “TL;DR” take-away version, so one can come back later and study more git stash hangs a stash-bag—this is a peculiar form of a merge commit that is not on any branch—on the current HEAD commit. A later git stash apply, when you’re at any commit—probably a different commit—then tries to restore the changes git … Read more