diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2020-10-07 00:56:16 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-07 09:49:05 -0700 |
| commit | c693ef781bef002bca15be74bec3a6a65c679eb5 (patch) | |
| tree | 7d92408076c51d7640aaff655184427a83f2f790 /Documentation | |
| parent | builtin/checkout: fix `git checkout -p HEAD...` bug (diff) | |
| download | tgif-c693ef781bef002bca15be74bec3a6a65c679eb5.tar.xz | |
Doc: document "A...B" form for <tree-ish> in checkout and switch
Using "A...B" has been supported for the <tree-ish> argument for a
while. However, its support has never been explicitly documented.
Explicitly document it so that users know that it is available.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-checkout.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-restore.txt | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 5b697eee1b..8c2f736f3a 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -350,6 +350,10 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`. <tree-ish>:: Tree to checkout from (when paths are given). If not specified, the index will be used. ++ +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`. \--:: Do not interpret any more arguments as options. diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt index 84c6c40010..55bde91ef9 100644 --- a/Documentation/git-restore.txt +++ b/Documentation/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:: |