diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-10-27 16:01:14 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-27 16:01:14 -0700 |
commit | 6a3d665f4a653957918d7c61d6e7a1e464fc8054 (patch) | |
tree | 2683481bae44ef7cdd6c2bfa64d03f01689b8872 /git-restore.txt | |
parent | e48956dde737f7b49a056b3142992a70244566a9 (diff) | |
download | git-htmldocs-6a3d665f4a653957918d7c61d6e7a1e464fc8054.tar.gz |
Autogenerated HTML docs for v2.29.1-59-gf9b64
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 84c6c4001..55bde91ef 100644 --- a/git-restore.txt +++ b/git-restore.txt @@ -40,6 +40,10 @@ OPTIONS + If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index. ++ +As a special case, you may use `"A...B"` as a shortcut for the +merge base of `A` and `B` if there is exactly one merge base. You can +leave out at most one of `A` and `B`, in which case it defaults to `HEAD`. -p:: --patch:: |