summaryrefslogtreecommitdiff
path: root/contrib/examples
diff options
context:
space:
mode:
authorLibravatar Simon A. Eugster <simon.eugster@eps.ch>2015-07-10 13:07:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-12 09:28:24 -0700
commitf30301657b68561392d910f6196380dd3976549e (patch)
tree2454ea789086eb632ea3d5c6c2cca00273691363 /contrib/examples
parentGit 2.2.2 (diff)
downloadtgif-f30301657b68561392d910f6196380dd3976549e.tar.xz
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>
Diffstat (limited to 'contrib/examples')
0 files changed, 0 insertions, 0 deletions