Andrew's git / gitweb.git / diff
?
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)
Doc about the above.

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

1  2 
Documentation/git-checkout.txt patch | diff1 | diff2 | blob | history
builtin/checkout.c patch | diff1 | diff2 | blob | history
diff --cc Documentation/git-checkout.txt
Simple merge
diff --cc builtin/checkout.c
Simple merge