diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:25 -0700 |
| commit | c0b901eaf71ca700eb6c8711af0c848df2d011c5 (patch) | |
| tree | 77e0220731844b83b818bfa4e392948dafb7d072 /t/t2021-checkout-overwrite.sh | |
| parent | Merge branch 'ib/scripted-parse-opt-better-hint-string' (diff) | |
| parent | checkout: document subtlety around --ours/--theirs (diff) | |
| download | tgif-c0b901eaf71ca700eb6c8711af0c848df2d011c5.tar.xz | |
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
Diffstat (limited to 't/t2021-checkout-overwrite.sh')
0 files changed, 0 insertions, 0 deletions