diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-16 10:28:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 10:28:10 (GMT) |
| commit | 3feaacbaa15f6437a1767935a5ff04fdef0e86e3 (patch) | |
| tree | 5e0aee35a024e67148c29a351c7f5e57cae62a0a /Documentation | |
| parent | e9bd21c3373278a9eabaf20cb60dbb6aa694e37e (diff) | |
| parent | a7256debd4b6ba9f6ccb94c0958ef48cdd8cb664 (diff) | |
| download | git-3feaacbaa15f6437a1767935a5ff04fdef0e86e3.zip git-3feaacbaa15f6437a1767935a5ff04fdef0e86e3.tar.gz git-3feaacbaa15f6437a1767935a5ff04fdef0e86e3.tar.bz2 | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-checkout.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index f179b43..877e5f5 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -242,6 +242,8 @@ should result in deletion of the path). + When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths. ++ +When switching branches with `--merge`, staged changes may be lost. --conflict=<style>:: The same as --merge option above, but changes the way the |