checkout: document subtlety around --ours/--theirs
authorSimon A. Eugster <simon.eugster@eps.ch>
Fri, 10 Jul 2015 20:07:11 +0000 (13:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 12 Jul 2015 16:28:24 +0000 (09:28 -0700)
commitf303016...7b68561392d910f6196380dd3976549e
tree2454ea7...9086eb632ea3d5c6c2cca00273691363copy hash to clipboard (tree)
parentfdf96a2...acf96a6ac538df8113b2aafd6ed71d50copy hash to clipboard (diff)
Documentation/git-checkout.txt