diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-08-10 23:17:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-10 23:17:46 -0700 |
| commit | 55d1932bce99d83fa0d891331fe3f3562d33af2e (patch) | |
| tree | cfd50a538a7214041f60dba488e3e48462e2a579 /Documentation | |
| parent | 98e79f63be7e2cf043bd3150ae9ac0c8d118ce61 (diff) | |
| parent | f653aee5a37b909e772d612eb7e226f09fd2f3d3 (diff) | |
| download | git-55d1932bce99d83fa0d891331fe3f3562d33af2e.tar.gz git-55d1932bce99d83fa0d891331fe3f3562d33af2e.tar.xz | |
Merge branch 'cr/tag'
* cr/tag:
Teach "git stripspace" the --strip-comments option
Make verify-tag a builtin.
builtin-tag.c: Fix two memory leaks and minor notation changes.
launch_editor(): Heed GIT_EDITOR and core.editor settings
Make git tag a builtin.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-stripspace.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-tag.txt | 8 | ||||
| -rw-r--r-- | Documentation/git-verify-tag.txt | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt index 1306d7bab..521235830 100644 --- a/Documentation/git-stripspace.txt +++ b/Documentation/git-stripspace.txt @@ -8,7 +8,7 @@ git-stripspace - Filter out empty lines SYNOPSIS -------- -'git-stripspace' < <stream> +'git-stripspace' [-s | --strip-comments] < <stream> DESCRIPTION ----------- @@ -16,6 +16,9 @@ Remove multiple empty lines, and empty lines at beginning and end. OPTIONS ------- +-s\|--strip-comments:: + In addition to empty lines, also strip lines starting with '#'. + <stream>:: Byte stream to act on. diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index aee2c1bdc..119117f0b 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git-tag' [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <name> [<head>] 'git-tag' -d <name>... 'git-tag' [-n [<num>]] -l [<pattern>] -'git-tag' -v <name> +'git-tag' -v <name>... DESCRIPTION ----------- @@ -23,7 +23,7 @@ Unless `-f` is given, the tag must not yet exist in If one of `-a`, `-s`, or `-u <key-id>` is passed, the command creates a 'tag' object, and requires the tag message. Unless -`-m <msg>` is given, an editor is started for the user to type +`-m <msg>` or `-F <file>` is given, an editor is started for the user to type in the tag message. Otherwise just the SHA1 object name of the commit object is @@ -59,15 +59,17 @@ OPTIONS Delete existing tags with the given names. -v:: - Verify the gpg signature of given the tag + Verify the gpg signature of the given tag names. -n <num>:: <num> specifies how many lines from the annotation, if any, are printed when using -l. The default is not to print any annotation lines. + If no number is given to `-n`, only the first line is printed. -l <pattern>:: List tags with names that match the given pattern (or all if no pattern is given). + Typing "git tag" without arguments, also lists all tags. -m <msg>:: Use the given tag message (instead of prompting) diff --git a/Documentation/git-verify-tag.txt b/Documentation/git-verify-tag.txt index 48d17fd9c..ac7fb1915 100644 --- a/Documentation/git-verify-tag.txt +++ b/Documentation/git-verify-tag.txt @@ -3,11 +3,11 @@ git-verify-tag(1) NAME ---- -git-verify-tag - Check the GPG signature of tag +git-verify-tag - Check the GPG signature of tags SYNOPSIS -------- -'git-verify-tag' <tag> +'git-verify-tag' <tag>... DESCRIPTION ----------- |