From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Aug 2015 18:01:25 +0000 (-0700)
Subject: Merge branch 'se/doc-checkout-ours-theirs'
X-Git-Tag: v2.6.0-rc0~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0b901eaf71ca700eb6c8711af0c848df2d011c5;p=thirdparty%2Fgit.git

Merge branch 'se/doc-checkout-ours-theirs'

A "rebase" replays changes of the local branch on top of something
else, as such they are placed in stage #3 and referred to as
"theirs", while the changes in the new base, typically a foreign
work, are placed in stage #2 and referred to as "ours".  Clarify
the "checkout --ours/--theirs".

* se/doc-checkout-ours-theirs:
  checkout: document subtlety around --ours/--theirs
---

c0b901eaf71ca700eb6c8711af0c848df2d011c5