diff --git a/Commands.md b/Commands.md index 95dc9ed..e05b7d7 100644 --- a/Commands.md +++ b/Commands.md @@ -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 ` shows the sample gitignore of specified types on screen. +Without option, `git ignore-io ` 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 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 diff --git a/History.md b/History.md index 786225c..e9853a6 100644 --- a/History.md +++ b/History.md @@ -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 diff --git a/bin/git-bulk b/bin/git-bulk index 431a379..ec70490 100755 --- a/bin/git-bulk +++ b/bin/git-bulk @@ -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 \ No newline at end of file +$butilcommand # run user command diff --git a/bin/git-effort b/bin/git-effort index e4bc12a..c2c65f4 100755 --- a/bin/git-effort +++ b/bin/git-effort @@ -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 diff --git a/bin/git-obliterate b/bin/git-obliterate index c747a45..992e0eb 100755 --- a/bin/git-obliterate +++ b/bin/git-obliterate @@ -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 diff --git a/install.cmd b/install.cmd index ac674cf..1341250 100644 --- a/install.cmd +++ b/install.cmd @@ -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 "^!" diff --git a/man/git-alias.1 b/man/git-alias.1 index 06806b2..dde2856 100644 --- a/man/git-alias.1 +++ b/man/git-alias.1 @@ -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 -. -.br -\fBgit\-alias\fR +\fBgit\-alias\fR \fBgit\-alias\fR \fBgit\-alias\fR . .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 . diff --git a/man/git-alias.html b/man/git-alias.html index e00864a..b95759a 100644 --- a/man/git-alias.html +++ b/man/git-alias.html @@ -76,8 +76,8 @@

SYNOPSIS

-

git-alias
-git-alias <search-pattern>
+

git-alias +git-alias <search-pattern> git-alias <alias-name> <command>

DESCRIPTION

@@ -105,7 +105,7 @@ 
$ 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
@@ -123,7 +123,7 @@ whois = !sh -c 'git log -i -1 --pretty="format:%an <%ae>
 
 
AUTHOR

 
-
Written by Jonhnny Weslley <jw@jonhnnyweslley.net>

+
Written by Jonhnny Weslley <jw@jonhnnyweslley.net>

 
 
REPORTING BUGS

 
@@ -136,7 +136,7 @@ whois = !sh -c 'git log -i -1 --pretty="format:%an <%ae>
 
   
    
     
  1. 
-    
  2. December 2015
    3. 
+    
  3. June 2017
    4. 
     
  4. git-alias(1)
    5. 
   

 
diff --git a/man/git-alias.md b/man/git-alias.md
index 054ef1f..693689c 100644
--- a/man/git-alias.md
+++ b/man/git-alias.md
@@ -3,9 +3,9 @@ git-alias(1) -- Define, search and show aliases
 
 ## SYNOPSIS
 
-`git-alias`  
-`git-alias` <search-pattern>  
-`git-alias` <alias-name> <command>  
+`git-alias`
+`git-alias` <search-pattern>
+`git-alias` <alias-name> <command>
 
 ## 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