Posted By: Anonymous
I’m apparently terrible at using git, despite my best attempts to understand it.
From kernel.org for
For every branch that is up to date or successfully pushed, add upstream (tracking) reference, used by argument-less git-pull(1) and other commands. For more information, see
Defines, together with
branch.<name>.remote, the upstream branch for the given branch. It tells git fetch/git pull which branch to merge and can also affect git push (see push.default). When in branch
<name>, it tells git fetch the default refspec to be marked for merging in FETCH_HEAD. The value is handled like the remote part of a refspec, and must match a ref which is fetched from the remote given by
"branch.<name>.remote". The merge information is used by git pull (which at first calls git fetch) to lookup the default branch for merging. Without this option, git pull defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. If you wish to setup git pull so that it merges into
<name>from another branch in the local repository, you can point
branch.<name>.mergeto the desired branch, and use the special setting . (a period) for
I successfully set up a remote repository with github, and I successfully pushed my first commit to it with:
git push -u origin master
Then, I unwittingly successfully pushed my second commit to my remote repository using:
git commit -m '[...]'
However, incorrectly thinking I would have to push again to
master, I ran:
# note: no -u git push origin master
What did that do? It didn’t seem to have any effect at all. Did I “undo”
git push -u origin master?
The key is “argument-less git-pull”. When you do a
git pull from a branch, without specifying a source remote or branch, git looks at the
branch.<name>.merge setting to know where to pull from.
git push -u sets this information for the branch you’re pushing.
To see the difference, let’s use a new empty branch:
$ git checkout -b test
First, we push without
$ git push origin test $ git pull You asked me to pull without telling me which branch you want to merge with, and 'branch.test.merge' in your configuration file does not tell me, either. Please specify which branch you want to use on the command line and try again (e.g. 'git pull <repository> <refspec>'). See git-pull(1) for details. If you often merge with the same branch, you may want to use something like the following in your configuration file: [branch "test"] remote = <nickname> merge = <remote-ref> [remote "<nickname>"] url = <url> fetch = <refspec> See git-config(1) for details.
Now if we add
$ git push -u origin test Branch test set up to track remote branch test from origin. Everything up-to-date $ git pull Already up-to-date.
Note that tracking information has been set up so that
git pull works as expected without specifying the remote or branch.
Update: Bonus tips:
- As Mark mentions in a comment, in addition to
git pullthis setting also affects default behavior of
git push. If you get in the habit of using
-uto capture the remote branch you intend to track, I recommend setting your
push.defaultconfig value to
git push -u <remote> HEADwill push the current branch to a branch of the same name on
<remote>(and also set up tracking so you can do
git pushafter that).