diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-02 12:48:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-02 12:48:04 -0700 |
| commit | c4096feabf5efb4497b6808dfeea8d8693f93e5b (patch) | |
| tree | 4c66b275c80cc92ea0c470b401fe633dc98df1b5 /git-restore.txt | |
| parent | 2b1164dcb4d39a0163d4ac1a7ba350140d59ce15 (diff) | |
| download | git-htmldocs-c4096feabf5efb4497b6808dfeea8d8693f93e5b.tar.gz | |
Autogenerated HTML docs for v2.42.0-307-gd0e80
Diffstat (limited to 'git-restore.txt')
| -rw-r--r-- | git-restore.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-restore.txt b/git-restore.txt index 5964810ca..c70444705 100644 --- a/git-restore.txt +++ b/git-restore.txt @@ -78,6 +78,8 @@ all modified paths. --theirs:: When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths. + This option cannot be used when checking out paths from a + tree-ish (i.e. with the `--source` option). + Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options @@ -87,6 +89,8 @@ in linkgit:git-checkout[1] for details. --merge:: When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths. + This option cannot be used when checking out paths from a + tree-ish (i.e. with the `--source` option). --conflict=<style>:: The same as `--merge` option above, but changes the way the |