]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'nd/checkout-m-doc-update'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Apr 2019 10:28:10 +0000 (19:28 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Apr 2019 10:28:10 +0000 (19:28 +0900)
commit3feaacbaa15f6437a1767935a5ff04fdef0e86e3
tree5e0aee35a024e67148c29a351c7f5e57cae62a0a
parente9bd21c3373278a9eabaf20cb60dbb6aa694e37e
parenta7256debd4b6ba9f6ccb94c0958ef48cdd8cb664
Merge branch 'nd/checkout-m-doc-update'

Doc about the above.

* nd/checkout-m-doc-update:
  checkout.txt: note about losing staged changes with --merge
Documentation/git-checkout.txt
builtin/checkout.c