diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-02 11:58:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-02 11:58:34 -0700 |
| commit | 372c767610c4e4d7f4832d037ac51a62a59875a3 (patch) | |
| tree | 9e0efda79c236ceeba4b727c89b79818358034b2 /Documentation/git-name-rev.txt | |
| parent | 2b603260f325b895baa20867bd45c8e251f19b78 (diff) | |
| parent | b003c00b7b5e352569061fec0b1e1bd0d0fa8b6a (diff) | |
| download | git-372c767610c4e4d7f4832d037ac51a62a59875a3.tar.gz git-372c767610c4e4d7f4832d037ac51a62a59875a3.tar.xz | |
Merge branch 'maint'
* maint:
git-name-rev: allow --name-only in combination with --stdin
builtin-name-rev.c: split deeply nested part from the main function
Conflicts:
Documentation/git-name-rev.txt
Diffstat (limited to 'Documentation/git-name-rev.txt')
| -rw-r--r-- | Documentation/git-name-rev.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt index 6e77ab135..abd2237e5 100644 --- a/Documentation/git-name-rev.txt +++ b/Documentation/git-name-rev.txt @@ -38,8 +38,7 @@ OPTIONS Instead of printing both the SHA-1 and the name, print only the name. If given with --tags the usual tag prefix of "tags/" is also omitted from the name, matching the output - of 'git-describe' more closely. This option - cannot be combined with --stdin. + of `git-describe` more closely. --no-undefined:: Die with error code != 0 when a reference is undefined, |