utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-10 23:46:24 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix various typos

Browse source
This commit is contained in:
spacewander 2017-06-18 14:10:12 +08:00
parent ce6d635c33
commit 4d885acda0
9 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Commands.md
View file

@ -604,9 +604,9 @@ build
## git ignore-io
Generate sample gitignore file from [gitignore.io](https://www.gitignore.io)
Generate sample gitignore file from [gitignore.io](https://www.gitignore.io)
Without option, `git ignore-io <type>` shows the sample gitignore of specified types on screen.
Without option, `git ignore-io <type>` shows the sample gitignore of specified types on screen.
```bash
$ git ignore-io vim
@ -622,7 +622,7 @@ $ git ignore-io vim
*~
```
To export it to `.gitignore` file you can use the following options:
To export it to `.gitignore` file you can use the following options:
* `-a` or `--append` to append the result to `.gitignore`
* `-r` or `--replace` to export `.gitignore` with the result
@ -631,7 +631,7 @@ To export it to `.gitignore` file you can use the following options:
$ git ignore-io vim python
```
For efficiency, `git ignore-io` store all available types at `~/.gi_list`.
For efficiency, `git ignore-io` store all available types at `~/.gi_list`.
To list all the available types:
* `-l` or `-L` : These two options will show the list in different format. Just try it.
@ -865,7 +865,7 @@ $ git back 3 # Remove the latest 3 commits.
Generates a changelog from git(1) tags (annotated or lightweight) and commit messages. Existing changelog files with filenames that begin with _Change_ or _History_ will be identified automatically with a case insensitive match pattern and existing content will be appended to the new output generated--this behavior can be disabled by specifying the prune option (-p|--prune-old). The generated file will be opened in **$EDITOR** when set.
If no tags exist, then all commits are output; if tags exist, then only the most-recent commits are output up to the last identified tag. This behavior can be changed by specifing one or both of the range options (-f|--final-tag and -s|--start-tag).
If no tags exist, then all commits are output; if tags exist, then only the most-recent commits are output up to the last identified tag. This behavior can be changed by specifying one or both of the range options (-f|--final-tag and -s|--start-tag).
The following options are available:
@ -1089,7 +1089,7 @@ Commit: Jack <jack@work.com>
Review https://reviews.foo.org/r/4567/
```
Replace previous issues with a new one
Replace previous issues with a new one
(Note that the identifier is case insensitive)
```bash

2
History.md
View file

@ -688,7 +688,7 @@
* Merge pull request #243 from sanusart/issue234
* Fix wrong git-info heading level in Readme.md
* Revert 2 commits to `git-changelog`
* Fix feature|refactor|bug testing argument for string lenght
* Fix feature|refactor|bug testing argument for string length
* Merge pull request #240 from egrim/bug/delete-merged-branches-clobbers-master
* Update docs to match `git-delete-merged-branches` behavior
* Exempt `master` from deleted branches

4
bin/git-bulk
View file

@ -148,7 +148,7 @@ while [ "${#}" -ge 1 ] ; do
esac && shift
done
# check option compatability
# check option compatibility
if $allwsmode && $singlemode; then echo 1>&2 "error: options -w and -a are incompatible" && exit 1; fi
# if single mode check the supplied workspace name
@ -161,4 +161,4 @@ case $butilcommand in
addworkspace) allowedargcount 3;;
esac
$butilcommand # run user command
$butilcommand # run user command

2
bin/git-effort
View file

@ -208,7 +208,7 @@ export log_args
bash_params=
# If bash exits sucessfully with --import-functions,
# If bash exits successfully with --import-functions,
# then we need to pass it (FreeBSD probably)
bash --import-functions -c ":" 1>/dev/null 2>&1
if [ $? -eq 0 ] ; then

2
bin/git-obliterate
View file

@ -4,7 +4,7 @@ file=""
range=""
for i in "$@"
do
# use '--' to seperate file list and rev-list arguments
# use '--' to separate file list and rev-list arguments
test "$i" == '--' && shift && break
file="$file"' '"$i"
shift

2
install.cmd
View file

@ -1,5 +1,5 @@
@ECHO OFF
:: don't leak env variables into the calling interperter...
:: don't leak env variables into the calling interpreter...
setlocal
:: better defaults for dealing with quotes...
:: You need to escape ! afterwards with ^^! or "^!"

12
man/git-alias.1
View file

@ -1,19 +1,13 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
.TH "GIT\-ALIAS" "1" "December 2015" "" ""
.TH "GIT\-ALIAS" "1" "June 2017" "" ""
.
.SH "NAME"
\fBgit\-alias\fR \- Define, search and show aliases
.
.SH "SYNOPSIS"
\fBgit\-alias\fR
.
.br
\fBgit\-alias\fR <search\-pattern>
.
.br
\fBgit\-alias\fR <alias\-name> <command>
\fBgit\-alias\fR \fBgit\-alias\fR <search\-pattern> \fBgit\-alias\fR <alias\-name> <command>
.
.SH "DESCRIPTION"
List all aliases, show one alias, or set one (global) alias\.
@ -50,7 +44,7 @@ $ git alias last "cat\-file commit HEAD"
.IP "" 0
.
.P
Providing only one argument, \fBgit\-alias\fR searchs for aliases matching the given value:
Providing only one argument, \fBgit\-alias\fR searches for aliases matching the given value:
.
.IP "" 4
.

10
man/git-alias.html
View file

@ -76,8 +76,8 @@
<h2 id="SYNOPSIS">SYNOPSIS</h2>
<p><code>git-alias</code><br />
<code>git-alias</code> &lt;search-pattern&gt;<br />
<p><code>git-alias</code>
<code>git-alias</code> &lt;search-pattern&gt;
<code>git-alias</code> &lt;alias-name&gt; &lt;command&gt;</p>
<h2 id="DESCRIPTION">DESCRIPTION</h2>
@ -105,7 +105,7 @@
<pre><code>$ git alias last "cat-file commit HEAD"
</code></pre>
<p> Providing only one argument, <code>git-alias</code> searchs for aliases matching the given value:</p>
<p> Providing only one argument, <code>git-alias</code> searches for aliases matching the given value:</p>
<pre><code>$ git alias ^la
last = cat-file commit HEAD
@ -123,7 +123,7 @@ whois = !sh -c 'git log -i -1 --pretty="format:%an &lt;%ae>
<h2 id="AUTHOR">AUTHOR</h2>
<p>Written by Jonhnny Weslley &lt;<a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#106;&#x77;&#x40;&#106;&#111;&#x6e;&#x68;&#x6e;&#x6e;&#x79;&#119;&#101;&#x73;&#x6c;&#108;&#x65;&#x79;&#46;&#110;&#x65;&#x74;" data-bare-link="true">&#x6a;&#119;&#x40;&#x6a;&#111;&#110;&#x68;&#110;&#110;&#121;&#119;&#x65;&#x73;&#108;&#x6c;&#x65;&#121;&#46;&#110;&#x65;&#x74;</a>&gt;</p>
<p>Written by Jonhnny Weslley &lt;<a href="&#x6d;&#97;&#x69;&#108;&#x74;&#x6f;&#x3a;&#x6a;&#119;&#x40;&#x6a;&#x6f;&#x6e;&#104;&#x6e;&#x6e;&#121;&#x77;&#101;&#115;&#108;&#108;&#101;&#x79;&#x2e;&#110;&#x65;&#116;" data-bare-link="true">&#x6a;&#x77;&#64;&#106;&#111;&#x6e;&#104;&#x6e;&#x6e;&#x79;&#119;&#x65;&#115;&#108;&#x6c;&#101;&#121;&#46;&#x6e;&#101;&#116;</a>&gt;</p>
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
@ -136,7 +136,7 @@ whois = !sh -c 'git log -i -1 --pretty="format:%an &lt;%ae>
<ol class='man-decor man-foot man foot'>
<li class='tl'></li>
<li class='tc'>December 2015</li>
<li class='tc'>June 2017</li>
<li class='tr'>git-alias(1)</li>
</ol>

8
man/git-alias.md
View file

@ -3,9 +3,9 @@ git-alias(1) -- Define, search and show aliases
## SYNOPSIS
`git-alias`
`git-alias` &lt;search-pattern&gt;
`git-alias` &lt;alias-name&gt; &lt;command&gt;
`git-alias`
`git-alias` &lt;search-pattern&gt;
`git-alias` &lt;alias-name&gt; &lt;command&gt;
## DESCRIPTION
@ -32,7 +32,7 @@ git-alias(1) -- Define, search and show aliases
$ git alias last "cat-file commit HEAD"
Providing only one argument, `git-alias` searchs for aliases matching the given value:
Providing only one argument, `git-alias` searches for aliases matching the given value:
$ git alias ^la
last = cat-file commit HEAD