git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fdf96a2)
checkout: document subtlety around --ours/--theirs
authorSimon A. Eugster <redacted>
Fri, 10 Jul 2015 20:07:11 +0000 (13:07 -0700)
committerJunio C Hamano <redacted>
Sun, 12 Jul 2015 16:28:24 +0000 (09:28 -0700)
commitf30301657b68561392d910f6196380dd3976549e
tree2454ea789086eb632ea3d5c6c2cca00273691363tree | snapshot
parentfdf96a20acf96a6ac538df8113b2aafd6ed71d50commit | diff
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 <redacted>
Signed-off-by: Simon A. Eugster <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/git-checkout.txt diff | blob | history
git clone https://git.99rst.org/PROJECT