diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-07 11:09:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-07 11:09:18 -0700 |
| commit | 7764a3b35c53b6859963ddad92bfc90563ac8baa (patch) | |
| tree | 2d0eaf020e1b06a608bfc0748368be7a511b7ae4 /Documentation/revisions.txt | |
| parent | 096bbd6537b8465d2123cea3361921793ce8a73a (diff) | |
| parent | 003c84f6d2b9e9c4d5bbf5262cae994bac7190cb (diff) | |
| download | git-7764a3b35c53b6859963ddad92bfc90563ac8baa.tar.gz | |
Merge branch 'jc/dotdot-is-parent-directory'
"git log .." errored out saying it is both rev range and a path when
there is no disambiguating "--" is on the command line. Update the
command line parser to interpret ".." as a path in such a case.
* jc/dotdot-is-parent-directory:
specifying ranges: we did not mean to make ".." an empty set
Diffstat (limited to 'Documentation/revisions.txt')
| -rw-r--r-- | Documentation/revisions.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index dc0070bcb7..69d996bc38 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -213,6 +213,13 @@ of 'r1' and 'r2' and is defined as It is the set of commits that are reachable from either one of 'r1' or 'r2' but not from both. +In these two shorthands, you can omit one end and let it default to HEAD. +For example, 'origin..' is a shorthand for 'origin..HEAD' and asks "What +did I do since I forked from the origin branch?" Similarly, '..origin' +is a shorthand for 'HEAD..origin' and asks "What did the origin do since +I forked from them?" Note that '..' would mean 'HEAD..HEAD' which is an +empty range that is both reachable and unreachable from HEAD. + Two other shorthands for naming a set that is formed by a commit and its parent commits exist. The 'r1{caret}@' notation means all parents of 'r1'. 'r1{caret}!' includes commit 'r1' but excludes |