Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>But wait:</p> <ul> <li>git won't merge (the second step of <code>git pull</code> after the <code>fetch</code> part) files unless the branch is checked out first. See "<a href="https://stackoverflow.com/questions/4318161/can-git-pull-all-update-all-my-local-branches">Can “<code>git pull --all</code>” update all my local branches?</a>"</li> <li><code>git pull</code> on <code>master</code> will merge files on <code>master</code>, meaning the next push will be a fast-forward one. A non fast-forward can only occur <a href="https://stackoverflow.com/questions/3598355/i-am-not-able-to-push-on-git/3598399#3598399">if a push to the remote <code>master</code> <em>from another repo</em> has been done prior to <em>your</em> push</a>.</li> </ul> <p>Note: I suppose you have tracked all your remote branches as in "<a href="https://stackoverflow.com/questions/379081/track-all-remote-git-branches-as-local-branches">Track all remote git branches as local branches.</a>"</p> <hr> <p>Note: Git 2.0 (Q2 2014) will introduce with <a href="https://github.com/git/git/commit/b814da891e8261b909fc5d9fb07b4e8b13989c2d" rel="nofollow noreferrer">commit b814da8</a> a config push.ff:</p> <pre><code>pull.ff:: </code></pre> <blockquote> <p>By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. </p> <ul> <li>When set to <code>false</code>, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the <code>--no-ff</code> option from the command line). </li> <li><strong>When set to <code>only</code>, only such fast-forward merges are allowed (equivalent to giving the <code>--ff-only</code> option from the command line).</strong></li> </ul> </blockquote>
    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.
    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