Autogenerated HTML docs for v2.5.0-234-gefc8a

1 files changed, 14 insertions, 1 deletions

diff --git a/git-checkout.html b/git-checkout.html
index ff473c751..dc7d41106 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -900,6 +900,19 @@ entries; instead, unmerged entries are ignored.</p></div>
         When checking out paths from the index, check out stage #2

         (<em>ours</em>) or #3 (<em>theirs</em>) for unmerged paths.

 </p>

+<div class="paragraph"><p>Note that during <code>git rebase</code> and <code>git pull --rebase</code>, <em>ours</em> and

+<em>theirs</em> may appear swapped; <code>--ours</code> gives the version from the

+branch the changes are rebased onto, while <code>--theirs</code> gives the

+version from the branch that holds your work that is being rebased.</p></div>

+<div class="paragraph"><p>This is because <code>rebase</code> is used in a workflow that treats the

+history at the remote as the shared canonical one, and treats the

+work done on the branch you are rebasing as the third-party work to

+be integrated, and you are temporarily assuming the role of the

+keeper of the canonical history during the rebase.  As the keeper of

+the canonical history, you need to view the history from the remote

+as <code>ours</code> (i.e. "our shared canonical history"), while what you did

+on your side branch as <code>theirs</code> (i.e. "one contributor&#8217;s work on top

+of it").</p></div>

 </dd>

 <dt class="hdlist1">

 -b &lt;new_branch&gt;

@@ -1377,7 +1390,7 @@ $ git add frotz</code></pre>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2015-07-13 14:44:41 PDT

+Last updated 2015-08-03 12:41:59 PDT

 </div>

 </div>

 </body>