| commit | f30301657b68561392d910f6196380dd3976549e | |
| author | Simon A. Eugster <simon.eugster@eps.ch> | |
| Fri, 10 Jul 2015 20:07:11 +0000 (10 13:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 12 Jul 2015 16:28:24 +0000 (12 09:28 -0700) | ||
| tree | 2454ea789086eb632ea3d5c6c2cca00273691363 | treesnapshot (tar.gz zip) |
| parent | fdf96a20acf96a6ac538df8113b2aafd6ed71d50 | commitdiff |
checkout: document subtlety around --ours/--theirs
During a 'rebase' (hence 'pull --rebase'), --ours/--theirs may
appear to be swapped to those who are not aware of the fact that
they are temporarily playing the role of the keeper of the more
authoritative history.
Add a note to clarify.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Simon A. Eugster <simon.eugster@eps.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
During a 'rebase' (hence 'pull --rebase'), --ours/--theirs may
appear to be swapped to those who are not aware of the fact that
they are temporarily playing the role of the keeper of the more
authoritative history.
Add a note to clarify.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Simon A. Eugster <simon.eugster@eps.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-checkout.txt | diffblobblamehistory |