From 873c3472052e3d0385be4ece7b70cfdf573c051e Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 1 Jun 2010 17:16:42 +0200 Subject: [PATCH] Documentation: A...B shortcut for checkout and rebase Describe the A...B shortcuts for checkout and rebase [-i] which were introduced in these commits: 619a64e ("checkout A...B" switches to the merge base between A and B, 2009-10-18) 61dfa1b ("rebase --onto A...B" replays history on the merge base between A and B, 2009-11-20) 230a456 (rebase -i: teach --onto A...B syntax, 2010-01-07) Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- Documentation/git-checkout.txt | 4 ++++ Documentation/git-rebase.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 37c1810e3..a3a87fa7f 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -136,6 +136,10 @@ edits from your current working tree. As a special case, the `"@\{-N\}"` syntax for the N-th last branch checks out the branch (instead of detaching). You may also specify `-` which is synonymous with `"@\{-1\}"`. ++ +As a further 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`. :: Name for the new branch. diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 5863decdc..50ba2e469 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -206,6 +206,10 @@ OPTIONS --onto option is not specified, the starting point is . May be any valid commit, and not just an existing branch name. ++ +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. :: Upstream branch to compare against. May be any valid commit, -- 2.26.2