{"thread":{"id":"23970","subject":"[PATCH] Documentation: A...B shortcut for checkout and rebase","startedAt":"2010-06-01T15:16:42Z","lastAt":"2010-06-01T15:16:42Z","messageCount":1,"participants":["Michael J Gruber"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"142693","messageId":"380480a004c2d5f80ba96324562172f3b2b42f3e.1275405181.git.git@drmicha.warpmail.net","threadId":"23970","inReplyTo":null,"subject":"[PATCH] Documentation: A...B shortcut for checkout and rebase","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-06-01T15:16:42Z","receivedAt":"2010-06-01T15:16:42Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Describe the A...B shortcuts for checkout and rebase [-i] which were\nintroduced in these commits:\n\n619a64e (\"checkout A...B\" switches to the merge base between A and B, 2009-10-18)\n61dfa1b (\"rebase --onto A...B\" replays history on the merge base between A and B, 2009-11-20)\n230a456 (rebase -i: teach --onto A...B syntax, 2010-01-07)\n\nSigned-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n---\nThe style in the two hunks is different so that it matches the surrounding\ntext. Talking about a style guide...\n\n Documentation/git-checkout.txt |    4 ++++\n Documentation/git-rebase.txt   |    4 ++++\n 2 files changed, 8 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex 4505eb6..afda5c3 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -154,6 +154,10 @@ edits from your current working tree.\n As a special case, the `\"@\\{-N\\}\"` syntax for the N-th last branch\n checks out the branch (instead of detaching).  You may also specify\n `-` which is synonymous with `\"@\\{-1\\}\"`.\n++\n+As a further special case, you may use `\"A...B\"` as a shortcut for the\n+merge base of `A` and `B` if there is exactly one merge base. You can\n+leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.\n \n <new_branch>::\n \tName for the new branch.\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 5863dec..50ba2e4 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -206,6 +206,10 @@ OPTIONS\n \t--onto option is not specified, the starting point is\n \t<upstream>.  May be any valid commit, and not just an\n \texisting branch name.\n++\n+As a special case, you may use \"A...B\" as a shortcut for the\n+merge base of A and B if there is exactly one merge base. You can\n+leave out at most one of A and B, in which case it defaults to HEAD.\n \n <upstream>::\n \tUpstream branch to compare against.  May be any valid commit,\n-- \n1.7.1.351.ge2633e\n"}]}