|
|
@ -95,12 +95,10 @@ using `--ours` or `--theirs`. With `-m`, changes made to the working tree |
|
|
|
file can be discarded to re-create the original conflicted merge result. |
|
|
|
file can be discarded to re-create the original conflicted merge result. |
|
|
|
|
|
|
|
|
|
|
|
'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]:: |
|
|
|
'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]:: |
|
|
|
This is similar to the "check out paths to the working tree |
|
|
|
This is similar to the previous mode, but lets you use the |
|
|
|
from either the index or from a tree-ish" mode described |
|
|
|
interactive interface to show the "diff" output and choose which |
|
|
|
above, but lets you use the interactive interface to show |
|
|
|
hunks to use in the result. See below for the description of |
|
|
|
the "diff" output and choose which hunks to use in the |
|
|
|
`--patch` option. |
|
|
|
result. See below for the description of `--patch` option. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
OPTIONS |
|
|
|
OPTIONS |
|
|
|
------- |
|
|
|
------- |
|
|
|