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 <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Jun 1, 2010 at 17:16 UTC
873c3472052e3d0385be4ece7b70cfdf573c051e
2 files changed
+8
Documentation/git-checkout.txt
+4
@@ -136,6 +136,10 @@ edits from your current working tree.
136
As a special case, the `"@\{-N\}"` syntax for the N-th last branch
137
checks out the branch (instead of detaching). You may also specify
138
`-` which is synonymous with `"@\{-1\}"`.
139
++
140
+As a further special case, you may use `"A...B"` as a shortcut for the
141
+merge base of `A` and `B` if there is exactly one merge base. You can
142
+leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
143
144
<new_branch>::
145
Name for the new branch.
Documentation/git-rebase.txt
+4
@@ -206,6 +206,10 @@ OPTIONS
206
--onto option is not specified, the starting point is
207
<upstream>. May be any valid commit, and not just an
208
existing branch name.
209
++
210
+As a special case, you may use "A...B" as a shortcut for the
211
+merge base of A and B if there is exactly one merge base. You can
212
+leave out at most one of A and B, in which case it defaults to HEAD.
213
214
<upstream>::
215
Upstream branch to compare against. May be any valid commit,