From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Aug 2015 21:41:28 +0000 (-0700)
Subject: Merge branch 'se/doc-checkout-ours-theirs' into maint
X-Git-Tag: v2.5.1~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=204ea3cad443df4f14623a09ee8201a552f067af;p=git-core%2Fgit.git

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

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
---

204ea3cad443df4f14623a09ee8201a552f067af