| commit | c0b901eaf71ca700eb6c8711af0c848df2d011c5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 3 Aug 2015 18:01:25 +0000 (3 11:01 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 3 Aug 2015 18:01:25 +0000 (3 11:01 -0700) | ||
| tree | 77e0220731844b83b818bfa4e392948dafb7d072 | treesnapshot (tar.gz zip) |
| parent | 2bf2d819e1ccd4865500e957cc5953de31255c46 | commitdiff |
| parent | f30301657b68561392d910f6196380dd3976549e | commitdiff |
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
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 |