diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:51:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:51:05 -0800 |
| commit | 620b89cd98219db33ce499c7f8e50d091fe9b598 (patch) | |
| tree | 0838749541fdf9f5fe36466bddc6d3d4167a0248 /Documentation | |
| parent | f68b780b2575628eca75e9502e4997f98ad2af3b (diff) | |
| parent | 3d6e0f745e5b958387c9116ff5ba6247b990e6e7 (diff) | |
| download | git-620b89cd98219db33ce499c7f8e50d091fe9b598.tar.gz git-620b89cd98219db33ce499c7f8e50d091fe9b598.tar.xz | |
Merge branch 'nd/extended-sha1-relpath'
* nd/extended-sha1-relpath:
get_sha1: teach ":$n:<path>" the same relative path logic
get_sha1: support relative path ":path" syntax
Make prefix_path() return char* without const
Conflicts:
sha1_name.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/revisions.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index 3d4b79c48..8b519d744 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -121,6 +121,10 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file. ':path' (with an empty part before the colon, e.g. `:README`) is a special case of the syntax described next: content recorded in the index at the given path. + A path starting with './' or '../' is relative to current working directory. + The given path will be converted to be relative to working tree's root directory. + This is most useful to address a blob or tree from a commit or tree that has + the same tree structure with the working tree. * A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path (e.g. `:0:README`); this names a blob object in the |