From ec181faaf5ceb6834850f0996698d17c2980138c Mon Sep 17 00:00:00 2001 From: Ud Yzr Date: Tue, 16 Apr 2019 23:30:54 +0200 Subject: [PATCH 1/3] Fix: Inspecting commits made on topic branch since... common ancestor with main branch. Issue detected and fixed by consulting git-revisions manual page (used git version is 2.21.0): ... - Include commits that are reachable from either or but exclude those that are reachable from both... .. - Include commits that are reachable from but exclude those that are reachable from ... --- book/05-distributed-git/sections/maintaining.asc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/book/05-distributed-git/sections/maintaining.asc b/book/05-distributed-git/sections/maintaining.asc index 44cab8061..646b11ccf 100644 --- a/book/05-distributed-git/sections/maintaining.asc +++ b/book/05-distributed-git/sections/maintaining.asc @@ -282,12 +282,12 @@ or, more concisely: $ git diff $(git merge-base contrib master) ---- -However, neither of those is particularly convenient, so Git provides another shorthand for doing the same thing: the triple-dot syntax. -In the context of the `git diff` command, you can put three periods after another branch to do a `diff` between the last commit of the branch you're on and its common ancestor with another branch: +However, neither of those is particularly convenient, so Git provides another shorthand for doing the same thing: the ellipsis (double-dot) syntax. +In the context of the `git diff` command, you can put two periods after another branch to do a `diff` between the last commit of the branch you're on and its common ancestor with another branch: [source,console] ---- -$ git diff master...contrib +$ git diff master..contrib ---- This command shows you only the work your current topic branch has introduced since its common ancestor with master. From 47df0f7be1f64ed5ee6338fe7007b1ec192b1b73 Mon Sep 17 00:00:00 2001 From: Ud Yzr Date: Sun, 12 May 2019 18:46:32 +0200 Subject: [PATCH 2/3] Fix referring to --- book/05-distributed-git/sections/maintaining.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/05-distributed-git/sections/maintaining.asc b/book/05-distributed-git/sections/maintaining.asc index 646b11ccf..d8ab9c275 100644 --- a/book/05-distributed-git/sections/maintaining.asc +++ b/book/05-distributed-git/sections/maintaining.asc @@ -282,7 +282,7 @@ or, more concisely: $ git diff $(git merge-base contrib master) ---- -However, neither of those is particularly convenient, so Git provides another shorthand for doing the same thing: the ellipsis (double-dot) syntax. +However, neither of those is particularly convenient, so Git provides another shorthand for doing the same thing: the double-dot syntax. In the context of the `git diff` command, you can put two periods after another branch to do a `diff` between the last commit of the branch you're on and its common ancestor with another branch: [source,console] From f3a4d37ed8fe3fdf3d311d06e1146a068e1bbef7 Mon Sep 17 00:00:00 2001 From: Ud Yzr Date: Sun, 12 May 2019 18:46:32 +0200 Subject: [PATCH 3/3] Fix reference to 'double-dot' --- book/05-distributed-git/sections/maintaining.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/05-distributed-git/sections/maintaining.asc b/book/05-distributed-git/sections/maintaining.asc index 646b11ccf..d8ab9c275 100644 --- a/book/05-distributed-git/sections/maintaining.asc +++ b/book/05-distributed-git/sections/maintaining.asc @@ -282,7 +282,7 @@ or, more concisely: $ git diff $(git merge-base contrib master) ---- -However, neither of those is particularly convenient, so Git provides another shorthand for doing the same thing: the ellipsis (double-dot) syntax. +However, neither of those is particularly convenient, so Git provides another shorthand for doing the same thing: the double-dot syntax. In the context of the `git diff` command, you can put two periods after another branch to do a `diff` between the last commit of the branch you're on and its common ancestor with another branch: [source,console]