Files
git/Documentation
Junio C Hamano 204ea3cad4 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
2015-08-19 14:41:28 -07:00
..
2015-08-03 10:45:34 -07:00
2015-07-13 14:00:26 -07:00
2015-05-11 14:39:28 -07:00
2014-11-04 13:14:44 -08:00
2013-09-04 12:23:25 -07:00
2014-11-04 13:14:44 -08:00
2014-11-04 13:14:44 -08:00
2015-05-11 14:39:28 -07:00
2015-05-19 13:17:57 -07:00
2013-10-18 13:50:12 -07:00
2013-04-12 12:00:52 -07:00
2015-08-03 10:45:34 -07:00
2015-01-22 13:44:14 -08:00