diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-10 16:28:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-10 16:28:17 -0700 |
| commit | eccdd4a4b39010678cef09a1c28c964396d2cc84 (patch) | |
| tree | 2d65a5eb275d2fae69f4bfe3fd046907a0cf1037 /revisions.txt | |
| parent | f335393cb267ed983d1b9d6574b95d6f26bd5a85 (diff) | |
| download | git-htmldocs-eccdd4a4b39010678cef09a1c28c964396d2cc84.tar.gz | |
Autogenerated HTML docs for v1.7.12-315-g682c
Diffstat (limited to 'revisions.txt')
| -rw-r--r-- | revisions.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/revisions.txt b/revisions.txt index dc0070bcb..991fcd8f3 100644 --- a/revisions.txt +++ b/revisions.txt @@ -55,6 +55,8 @@ when you run `git cherry-pick`. + Note that any of the 'refs/*' cases above may come either from the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file. +While the ref name encoding is unspecified, UTF-8 is prefered as +some output processing may assume ref names in UTF-8. '<refname>@\{<date>\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes ago\}':: A ref followed by the suffix '@' with a date specification @@ -213,6 +215,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 |