Skip to content

Conversation

@alfredmyers
Copy link
Contributor

@alfredmyers alfredmyers commented Jun 14, 2019

Reverts #1252

Previous text (c568962) was correct.

The pull request being reverted applies the meaning of .. and ... as
used in revision ranges for git log to git diff. The later does not
receive revision ranges as a parameter - as can be seen in the manual:

git diff [--options] <commit> <commit> [--] [...]
This is to view the changes between two arbitrary .

git diff [--options] <commit>..<commit> [--] [...]
This is synonymous to the previous form. If on one side is omitted, it will have the same effect as using HEAD instead.

git diff [--options] <commit>...<commit> [--] [...]
This form is to view the changes on the branch containing and up to the second , starting at a common ancestor of both <commit>. "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B". You can omit any one of <commit>, which has the same effect as using HEAD instead.

This commit reverts commit ec181fa
and f3a4d37.

Previous text (c568962) was correct.

The pull request being reverted applies the meaning of `..` and `...` as
used in revision ranges for `git log` to `git diff`. The later does not
receive revision ranges as a parameter - as can be seen in the manual:

       git diff [--options] <commit> <commit> [--] [<path>...]
           This is to view the changes between two arbitrary <commit>.

       git diff [--options] <commit>..<commit> [--] [<path>...]
           This is synonymous to the previous form. If <commit> on one
side is omitted, it will
           have the same effect as using HEAD instead.

       git diff [--options] <commit>...<commit> [--] [<path>...]
           This form is to view the changes on the branch containing and
up to the second <commit>,
           starting at a common ancestor of both <commit>. "git diff
A...B" is equivalent to "git
           diff $(git-merge-base A B) B". You can omit any one of
<commit>, which has the same
           effect as using HEAD instead.

This commit reverts commit ec181fa
and f3a4d37.
@ben
Copy link
Member

ben commented Jun 14, 2019

Guh. I think it's a testament to the weirdness of this notation that even I get confused sometimes. Thanks!

@ben ben merged commit de5cdc9 into progit:master Jun 14, 2019
@alfredmyers alfredmyers deleted the errata branch June 14, 2019 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants