diff --git a/man/git-changelog.1 b/man/git-changelog.1 index e14c537..62594db 100644 --- a/man/git-changelog.1 +++ b/man/git-changelog.1 @@ -16,7 +16,7 @@ Generates a changelog from git(1) tags (annotated or lightweight) and commit messages\. Existing changelog files with filenames that begin with \fIChange\fR or \fIHistory\fR 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 \fB$EDITOR\fR when set\. . .P -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)\. . .SH "OPTIONS" diff --git a/man/git-changelog.html b/man/git-changelog.html index dca780d..d71fa37 100644 --- a/man/git-changelog.html +++ b/man/git-changelog.html @@ -83,7 +83,7 @@

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).

OPTIONS

diff --git a/man/git-chore.1 b/man/git-chore.1 index d557f46..9e169f4 100644 --- a/man/git-chore.1 +++ b/man/git-chore.1 @@ -38,7 +38,7 @@ $ git chore finish chore\-123456 .fi . .SH "AUTHOR" -Written by Chris Hall <\fIchristopher\.k\.hall@gmail\.com\fR> from bug/feature/refactor comamnds originally written by Jesús Espino <\fIjespinog@gmail\.com\fR> +Written by Chris Hall <\fIchristopher\.k\.hall@gmail\.com\fR> from bug/feature/refactor commands originally written by Jesús Espino <\fIjespinog@gmail\.com\fR> . .SH "REPORTING BUGS" <\fIhttps://github\.com/tj/git\-extras/issues\fR> diff --git a/man/git-chore.html b/man/git-chore.html index cbe6b07..2da85e3 100644 --- a/man/git-chore.html +++ b/man/git-chore.html @@ -104,7 +104,7 @@ $ git chore finish chore-123456

AUTHOR

-

Written by Chris Hall <christopher.k.hall@gmail.com> from bug/feature/refactor comamnds originally written by Jesús Espino <jespinog@gmail.com>

+

Written by Chris Hall <christopher.k.hall@gmail.com> from bug/feature/refactor commands originally written by Jesús Espino <jespinog@gmail.com>

REPORTING BUGS

diff --git a/man/git-guilt.1 b/man/git-guilt.1 index 6df3870..833bf12 100644 --- a/man/git-guilt.1 +++ b/man/git-guilt.1 @@ -53,7 +53,7 @@ $ git guilt (1) spacewander ++++ (1) There is only one modified file and it is not staged\. The four -plusses means that the file has four lines, all contributed by spacewander\. +pluses means that the file has four lines, all contributed by spacewander\. . .fi . diff --git a/man/git-guilt.html b/man/git-guilt.html index b71f590..6461b94 100644 --- a/man/git-guilt.html +++ b/man/git-guilt.html @@ -112,7 +112,7 @@ If not specified, <until> will default to HEAD.

spacewander ++++ (1) There is only one modified file and it is not staged. The four -plusses means that the file has four lines, all contributed by spacewander. +pluses means that the file has four lines, all contributed by spacewander.

Find blame delta between two commits:

diff --git a/man/git-ignore.1 b/man/git-ignore.1 index cc8cc98..63006d9 100644 --- a/man/git-ignore.1 +++ b/man/git-ignore.1 @@ -49,7 +49,7 @@ An optional prefix ! which negates the pattern; any matching file excluded by a If the pattern ends with a slash, it is removed for the purpose of the following description, but it would only find a match with a directory\. In other words, foo/ will match a directory foo and paths underneath it, but will not match a regular file or a symbolic link foo (this is consistent with the way how pathspec works in general in git)\. . .IP "\(bu" 4 -If the pattern does not contain a slash /, git treats it as a shell glob pattern and checks for a match against the pathname relative to the location of the \.gitignore file (relative to the toplevel of the work tree if not from a \.gitignore file)\. +If the pattern does not contain a slash /, git treats it as a shell glob pattern and checks for a match against the pathname relative to the location of the \.gitignore file (relative to the top level of the work tree if not from a \.gitignore file)\. . .IP "\(bu" 4 Otherwise, git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname\. For example, "Documentation/*\.html" matches "Documentation/git\.html" but not "Documentation/ppc/ppc\.html" or "tools/perf/Documentation/perf\.html"\. diff --git a/man/git-ignore.html b/man/git-ignore.html index 74b0baa..dec1139 100644 --- a/man/git-ignore.html +++ b/man/git-ignore.html @@ -107,7 +107,7 @@

  • A line starting with # serves as a comment. For example, "# This is a comment"

  • An optional prefix ! which negates the pattern; any matching file excluded by a previous pattern will become included again. If a negated pattern matches, this will override lower precedence patterns sources. To use an exclamation ! as command line argument it is best placed between single quotes ''. For example, '!src'

  • If the pattern ends with a slash, it is removed for the purpose of the following description, but it would only find a match with a directory. In other words, foo/ will match a directory foo and paths underneath it, but will not match a regular file or a symbolic link foo (this is consistent with the way how pathspec works in general in git).

    • -

  • If the pattern does not contain a slash /, git treats it as a shell glob pattern and checks for a match against the pathname relative to the location of the .gitignore file (relative to the toplevel of the work tree if not from a .gitignore file).

    • +

  • If the pattern does not contain a slash /, git treats it as a shell glob pattern and checks for a match against the pathname relative to the location of the .gitignore file (relative to the top level of the work tree if not from a .gitignore file).

  • Otherwise, git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, "Documentation/*.html" matches "Documentation/git.html" but not "Documentation/ppc/ppc.html" or "tools/perf/Documentation/perf.html".

  • A leading slash matches the beginning of the pathname. For example, "/*.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c".

    • diff --git a/man/git-ignore.md b/man/git-ignore.md index 199a401..968e822 100644 --- a/man/git-ignore.md +++ b/man/git-ignore.md @@ -41,7 +41,7 @@ Pattern format as described in the git manual * Otherwise, git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, "Documentation/*.html" matches "Documentation/git.html" but not "Documentation/ppc/ppc.html" or "tools/perf/Documentation/perf.html". - * A leading slash matches the beginning of the path name. For example, "/*.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c". + * A leading slash matches the beginning of the pathname. For example, "/*.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c". ## EXAMPLES diff --git a/man/git-obliterate.1 b/man/git-obliterate.1 index d4cd0ec..b52276b 100644 --- a/man/git-obliterate.1 +++ b/man/git-obliterate.1 @@ -10,10 +10,10 @@ git obliterate [\-\- ] . .SH "DESCRIPTION" -Completely remove some files from the repository, including past commits and tags\. WARNING! This command will rewirte the history similar to \fBgit rebase\fR(though it affects more)\. The rewritten history will have different object names for all the objects and will not converge with the original branch\. So \fBavoid using it on commits that you shared\fR\. And it will mess up stash, so \fBdon\'t have stash when you run \fBgit obliterate\fR\fR\. +Completely remove some files from the repository, including past commits and tags\. WARNING! This command will rewrite the history similar to \fBgit rebase\fR(though it affects more)\. The rewritten history will have different object names for all the objects and will not converge with the original branch\. So \fBavoid using it on commits that you shared\fR\. And it will mess up stash, so \fBdon\'t have stash when you run \fBgit obliterate\fR\fR\. . .SH "OPTIONS" -You can pass rev\-list options to indicate the range of commits affected\. Those options need to be seperated with \'\-\-\' before them\. Run \fBgit help rev\-list\fR to see the acceptable options\. +You can pass rev\-list options to indicate the range of commits affected\. Those options need to be separated with \'\-\-\' before them\. Run \fBgit help rev\-list\fR to see the acceptable options\. . .SH "Examples" Remove \.secret from the repository: diff --git a/man/git-obliterate.html b/man/git-obliterate.html index 9def756..f78aeef 100644 --- a/man/git-obliterate.html +++ b/man/git-obliterate.html @@ -81,12 +81,12 @@

    DESCRIPTION

    Completely remove some files from the repository, including past commits and tags. -WARNING! This command will rewirte the history similar to git rebase(though it affects more). The rewritten history will have different object names for all the objects and will not converge with the original branch. So avoid using it on commits that you shared. +WARNING! This command will rewrite the history similar to git rebase(though it affects more). The rewritten history will have different object names for all the objects and will not converge with the original branch. So avoid using it on commits that you shared. And it will mess up stash, so don't have stash when you run git obliterate.

    OPTIONS

    -

    You can pass rev-list options to indicate the range of commits affected. Those options need to be seperated with '--' before them. Run git help rev-list to see the acceptable options.

    +

    You can pass rev-list options to indicate the range of commits affected. Those options need to be separated with '--' before them. Run git help rev-list to see the acceptable options.

    Examples

    diff --git a/man/git-pull-request.1 b/man/git-pull-request.1 index 59b4a75..85b2ecb 100644 --- a/man/git-pull-request.1 +++ b/man/git-pull-request.1 @@ -10,7 +10,7 @@ \fBgit\-pull\-request\fR [] . .SH "DESCRIPTION" -Create pull request for a project on GitHub via commandline\. +Create pull request for a project on GitHub via command line\. . .P Uses the email from \fBgit config user\.email\fR to open the pull request\. diff --git a/man/git-pull-request.html b/man/git-pull-request.html index 40144a7..1a1c808 100644 --- a/man/git-pull-request.html +++ b/man/git-pull-request.html @@ -80,7 +80,7 @@

    DESCRIPTION

    -

    Create pull request for a project on GitHub via commandline.

    +

    Create pull request for a project on GitHub via command line.

    Uses the email from git config user.email to open the pull request.

    diff --git a/man/git-reauthor.1 b/man/git-reauthor.1 index 0511b25..d62578f 100644 --- a/man/git-reauthor.1 +++ b/man/git-reauthor.1 @@ -13,7 +13,7 @@ Lets you replace the author and/or committer identities in commits and tags\. . .P -The command goes through all existing commits and tags in all local branches to selectively modify the identities present in those objects\. All the other informations such as dates, messages,\.\. are preserved\. +The command goes through all existing commits and tags in all local branches to selectively modify the identities present in those objects\. All the other information such as dates, messages,\.\. are preserved\. . .P You can rewrite all the identities in the commits and tags objects by using the \-\-all flag, or only replace the identities whose email matches the value of the \-\-old\-email option\. It is also possible to limit the rewrite to a certain type of identity: the author or the committer identity\. By default, both of them are affected\. diff --git a/man/git-reauthor.html b/man/git-reauthor.html index 5d6a14c..0554e53 100644 --- a/man/git-reauthor.html +++ b/man/git-reauthor.html @@ -82,7 +82,7 @@

    Lets you replace the author and/or committer identities in commits and tags.

    -

    The command goes through all existing commits and tags in all local branches to selectively modify the identities present in those objects. All the other informations such as dates, messages,.. are preserved.

    +

    The command goes through all existing commits and tags in all local branches to selectively modify the identities present in those objects. All the other information such as dates, messages,.. are preserved.

    You can rewrite all the identities in the commits and tags objects by using the --all flag, or only replace the identities whose email matches the value of the --old-email option. It is also possible to limit the rewrite to a certain type of identity: the author or the committer identity. By default, both of them are affected.
    For each of those identities to update, the command will replace the name and/or email with the new correct values as defined via the options. If the new identity name to set is not defined, the current one will be kept (and vice-versa with the email).