diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-01 15:14:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-01 15:14:24 -0800 |
| commit | 8bad3de2c8390d952308652493fb72f58820895e (patch) | |
| tree | 0ac093f7a1ea176a82b7de17e9b7c7198223fbf9 /Documentation/git-for-each-ref.txt | |
| parent | 6d579a0de63157b771958c30c0d8a28cfafa7574 (diff) | |
| parent | 0571979bd60837d3c0802ecc1a47c48b4a6114d0 (diff) | |
| download | git-8bad3de2c8390d952308652493fb72f58820895e.tar.gz git-8bad3de2c8390d952308652493fb72f58820895e.tar.xz | |
Merge branch 'jk/list-tag-2.7-regression'
"git tag" started listing a tag "foo" as "tags/foo" when a branch
named "foo" exists in the same repository; remove this unnecessary
disambiguation, which is a regression introduced in v2.7.0.
* jk/list-tag-2.7-regression:
tag: do not show ambiguous tag names as "tags/foo"
t6300: use test_atom for some un-modern tests
Diffstat (limited to 'Documentation/git-for-each-ref.txt')
| -rw-r--r-- | Documentation/git-for-each-ref.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index 06208c499..2e3e96f66 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -92,7 +92,11 @@ refname:: The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short name of the ref append `:short`. The option core.warnAmbiguousRefs is used to select the strict - abbreviation mode. + abbreviation mode. If `strip=<N>` is appended, strips `<N>` + slash-separated path components from the front of the refname + (e.g., `%(refname:strip=2)` turns `refs/tags/foo` into `foo`. + `<N>` must be a positive integer. If a displayed ref has fewer + components than `<N>`, the command aborts with an error. objecttype:: The type of the object (`blob`, `tree`, `commit`, `tag`). |