| commit | 204ea3cad443df4f14623a09ee8201a552f067af | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Aug 2015 21:41:28 +0000 (19 14:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Aug 2015 21:41:28 +0000 (19 14:41 -0700) | ||
| tree | 2de1e55c051b00a24c617dcf64811eb5364d0be1 | treesnapshot (tar.gz zip) |
| parent | b083703ce34b27a0f97d7e2d4d2eec196a53b707 | commitdiff |
| parent | f30301657b68561392d910f6196380dd3976549e | commitdiff |
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
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
| Documentation/git-checkout.txt | diff1 | diff2 | blobhistory |