summaryrefslogtreecommitdiff
path: root/Documentation/revisions.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-21 14:30:19 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-21 14:30:19 -0800
commit41cd7974b0b67b78c39bccc86718dbe19390f768 (patch)
treeb76bbad20d6050e0f7bad5f9be7eb19430ee9074 /Documentation/revisions.txt
parent643b6ef809cdbc47c698b688b0dfe218eca9b474 (diff)
parent4322842acfaace812308f8aec0fe39a358f3c6f2 (diff)
downloadgit-41cd7974b0b67b78c39bccc86718dbe19390f768.tar.gz
Merge branch 'nd/oneline-sha1-name-from-specific-ref'
* nd/oneline-sha1-name-from-specific-ref: get_sha1: handle special case $commit^{/} get_sha1: support $commit^{/regex} syntax get_sha1_oneline: make callers prepare the commit list to traverse get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable
Diffstat (limited to 'Documentation/revisions.txt')
-rw-r--r--Documentation/revisions.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 8b519d7448..9e92734bc1 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -106,6 +106,12 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.
and dereference the tag recursively until a non-tag object is
found.
+* A suffix '{caret}' to a revision parameter followed by a brace
+ pair that contains a text led by a slash (e.g. `HEAD^{/fix nasty bug}`):
+ this is the same as `:/fix nasty bug` syntax below except that
+ it returns the youngest matching commit which is reachable from
+ the ref before '{caret}'.
+
* A colon, followed by a slash, followed by a text (e.g. `:/fix nasty bug`): this names
a commit whose commit message matches the specified regular expression.
This name returns the youngest matching commit which is