Merge branch 'se/doc-checkout-ours-theirs' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:41:28 +0000 (14:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:41:28 +0000 (14:41 -0700)
commit204ea3c...d443df4f14623a09ee8201a552f067af
tree2de1e55...051b00a24c617dcf64811eb5364d0be1copy hash to clipboard (tree)
parentb083703...e34b27a0f97d7e2d4d2eec196a53b707copy hash to clipboard (diff)
parentf303016...7b68561392d910f6196380dd3976549ecopy hash to clipboard (diff)
Documentation/git-checkout.txt