summaryrefslogtreecommitdiff
path: root/Documentation/revisions.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-10 14:20:10 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-10 14:20:10 -0800
commitfb795323ce3ce5a358f8e55641777b9cdbeab846 (patch)
tree886f5c1eaef8861f19bbd8b3d7a364444d9ba9ca /Documentation/revisions.txt
parentMerge branch 'jk/options-cleanup' (diff)
parentobject name: introduce '^{/!-<negative pattern>}' notation (diff)
downloadtgif-fb795323ce3ce5a358f8e55641777b9cdbeab846.tar.xz
Merge branch 'wp/sha1-name-negative-match'
A new "<branch>^{/!-<pattern>}" notation can be used to name a commit that is reachable from <branch> that does not match the given <pattern>. * wp/sha1-name-negative-match: object name: introduce '^{/!-<negative pattern>}' notation test for '!' handling in rev-parse's named commits
Diffstat (limited to 'Documentation/revisions.txt')
-rw-r--r--Documentation/revisions.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index fa4bdb208c..19314e3b7f 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -176,11 +176,12 @@ existing tag object.
A colon, followed by a slash, followed by a text, names
a commit whose commit message matches the specified regular expression.
This name returns the youngest matching commit which is
- reachable from any ref. If the commit message starts with a
- '!' you have to repeat that; the special sequence ':/!',
- followed by something else than '!', is reserved for now.
- The regular expression can match any part of the commit message. To
- match messages starting with a string, one can use e.g. ':/^foo'.
+ reachable from any ref. The regular expression can match any part of the
+ commit message. To match messages starting with a string, one can use
+ e.g. ':/^foo'. The special sequence ':/!' is reserved for modifiers to what
+ is matched. ':/!-foo' performs a negative match, while ':/!!foo' matches a
+ literal '!' character, followed by 'foo'. Any other sequence beginning with
+ ':/!' is reserved for now.
'<rev>:<path>', e.g. 'HEAD:README', ':README', 'master:./README'::
A suffix ':' followed by a path names the blob or tree