Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <blockquote> <p>What does "your configuration file" mean here?</p> </blockquote> <p>Your repo's configuration file, found at <code>.git/config</code> at the root of your repo. (There's also a per-user global config file at <code>~/.gitconfig</code>, but you don't want to put repo-specific settings there.)</p> <blockquote> <p>Which file should I edit, and what exactly should I type in?</p> </blockquote> <p>You can use the <code>git config</code> program to write configuration information, instead of entering it manually. However, if you want to do it manually, just open up <code>.git/config</code> -- the syntax is fairly straightforward.</p> <blockquote> <p>What's nickname in this case?</p> </blockquote> <p>Nickname, in this case, is the name of the remote -- so "stick". You don't have to worry about the <code>remote.*</code> options, as those have already been set up, but you do need to set the <code>branch.*</code> options. These options tell Git what to merge when doing a <code>git pull</code> from stick.</p> <p>Say you want to merge in master from stick when doing a <code>git pull</code> from stick. You can do so like this:</p> <pre><code># Sets stick as default remote for git pull. # Note that origin will no longer be the default remote for git pull! $ git config branch.master.remote stick # Automatically merge in stick's master branch when doing a git pull $ git config branch.master.merge refs/heads/master </code></pre> <p>So now, when you do a <code>git pull</code> without any remote or refspec info, it'll fetch all the branches from stick, and merge in stick's master branch. Note that origin will <em>not</em> be the default remote anymore; to merge in origin's master branch, you'll have to use <code>git pull origin master</code>.</p> <p>If you don't want to change the default remote to stick, you'll have to continue using <code>git pull stick master</code>.</p>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload