diff --git a/book/05-distributed-git/sections/maintaining.asc b/book/05-distributed-git/sections/maintaining.asc index d8ab9c275..44cab8061 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 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: +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: [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.