From 235a91e6b0d1d18a2517cf7e0a18278a6912bdb0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 6 Jan 2006 17:13:58 -0800 Subject: [PATCH] Autogenerated HTML docs for 026351a03507dc3a2e89e068c01234dc55914df2 --- cvs-migration.html | 4 ++-- cvs-migration.txt | 2 +- diff-format.txt | 2 +- diff-options.txt | 2 +- git-add.html | 4 ++-- git-add.txt | 2 +- git-am.html | 7 ++++--- git-am.txt | 1 + git-apply.html | 7 +++++-- git-apply.txt | 5 ++++- git-archimport.html | 10 +++++----- git-archimport.txt | 8 ++++---- git-cat-file.html | 4 ++-- git-cat-file.txt | 2 +- git-checkout-index.html | 7 ++++--- git-checkout-index.txt | 3 ++- git-clone.html | 6 ++++-- git-clone.txt | 4 +++- git-commit-tree.html | 5 +++-- git-commit-tree.txt | 3 ++- git-commit.html | 6 ++++-- git-commit.txt | 4 +++- git-cvsexportcommit.html | 5 ++--- git-cvsexportcommit.txt | 3 +-- git-cvsimport.html | 10 +++++----- git-cvsimport.txt | 8 ++++---- git-daemon.html | 7 ++++--- git-daemon.txt | 3 ++- git-diff-files.html | 6 +++--- git-diff-index.html | 10 +++++----- git-diff-index.txt | 4 ++-- git-diff-stages.html | 6 +++--- git-diff-tree.html | 12 +++++++----- git-diff-tree.txt | 6 ++++-- git-diff.html | 4 ++-- git-diff.txt | 2 +- git-format-patch.html | 8 +++++--- git-format-patch.txt | 6 ++++-- git-fsck-objects.html | 6 ++++-- git-fsck-objects.txt | 4 +++- git-grep.html | 4 ++-- git-grep.txt | 3 +-- git-http-fetch.html | 6 +++--- git-http-fetch.txt | 4 ++-- git-init-db.html | 20 +++++++++++++++++--- git-init-db.txt | 16 ++++++++++++++-- git-ls-files.html | 4 ++-- git-ls-files.txt | 2 +- git-pack-objects.html | 4 ++-- git-pack-objects.txt | 2 +- git-repo-config.html | 6 +++--- git-repo-config.txt | 4 ++-- git-rev-list.html | 29 +++++++++++++++-------------- git-rev-list.txt | 25 +++++++++++++------------ git-show-branch.html | 4 ++-- git-show-branch.txt | 2 +- git-svnimport.html | 10 +++++----- git-svnimport.txt | 8 ++++---- git.html | 4 ++-- git.txt | 2 +- glossary.html | 4 ++-- glossary.txt | 2 +- howto-index.html | 2 +- howto/isolate-bugs-with-bisect.txt | 2 +- repository-layout.html | 6 +++--- repository-layout.txt | 4 ++-- 66 files changed, 223 insertions(+), 164 deletions(-) diff --git a/cvs-migration.html b/cvs-migration.html index d3ccbe147..50f465368 100644 --- a/cvs-migration.html +++ b/cvs-migration.html @@ -395,7 +395,7 @@ mailing list archives for details).

git has a couple of alternatives, though, that you may find sufficient or even superior depending on your use. One is called "git-whatchanged" (for obvious reasons) and the other one is called "pickaxe" ("a tool for -the software archeologist").

+the software archaeologist").

The "git-whatchanged" script is a truly trivial script that can give you a good overview of what has changed in a file or a directory (or an arbitrary list of files or directories). The "pickaxe" support is an @@ -518,7 +518,7 @@ that contain this changed "if" statement:

diff --git a/cvs-migration.txt b/cvs-migration.txt index dc9387b69..8fd1a3349 100644 --- a/cvs-migration.txt +++ b/cvs-migration.txt @@ -138,7 +138,7 @@ mailing list archives for details). git has a couple of alternatives, though, that you may find sufficient or even superior depending on your use. One is called "git-whatchanged" (for obvious reasons) and the other one is called "pickaxe" ("a tool for -the software archeologist"). +the software archaeologist"). The "git-whatchanged" script is a truly trivial script that can give you a good overview of what has changed in a file or a directory (or an diff --git a/diff-format.txt b/diff-format.txt index 97756ec03..0398b408c 100644 --- a/diff-format.txt +++ b/diff-format.txt @@ -117,7 +117,7 @@ git specific extension to diff format What -p option produces is slightly different from the traditional diff format. -1. It is preceeded with a "git diff" header, that looks like +1. It is preceded with a "git diff" header, that looks like this: diff --git a/file1 b/file2 diff --git a/diff-options.txt b/diff-options.txt index 9e574a04d..5c85167ff 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -21,7 +21,7 @@ --abbrev[=]:: Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header - lines, show only handful dhexigits prefix. This is + lines, show only handful hexdigits prefix. This is independent of --full-index option above, which controls the diff-patch output format. Non default number of digits can be specified with --abbrev=. diff --git a/git-add.html b/git-add.html index 875931a9d..f47ba0864 100644 --- a/git-add.html +++ b/git-add.html @@ -311,7 +311,7 @@ for people used to do "cvs add".

DISCUSSION

The list of <file> given to the command is fed to git-ls-files -command to list files that are not registerd in the index and +command to list files that are not registered in the index and are not ignored/excluded by $GIT_DIR/info/exclude file or .gitignore file in each directory. This means two things:

    @@ -371,7 +371,7 @@ git-add git-*.sh
diff --git a/git-add.txt b/git-add.txt index 4cae41267..89e461402 100644 --- a/git-add.txt +++ b/git-add.txt @@ -31,7 +31,7 @@ DISCUSSION ---------- The list of given to the command is fed to `git-ls-files` -command to list files that are not registerd in the index and +command to list files that are not registered in the index and are not ignored/excluded by `$GIT_DIR/info/exclude` file or `.gitignore` file in each directory. This means two things: diff --git a/git-am.html b/git-am.html index 83459576a..781ac0f10 100644 --- a/git-am.html +++ b/git-am.html @@ -272,8 +272,9 @@ git-am(1) Manual Page

SYNOPSIS

-

git-am [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>… -git-am [--skip | --resolved]

+
+
git-am [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>… +git-am [--skip | --resolved]

DESCRIPTION

@@ -407,7 +408,7 @@ names.

diff --git a/git-am.txt b/git-am.txt index a415fe24c..02cabc935 100644 --- a/git-am.txt +++ b/git-am.txt @@ -8,6 +8,7 @@ git-am - Apply a series of patches in a mailbox SYNOPSIS -------- +[verse] 'git-am' [--signoff] [--dotest=] [--utf8] [--binary] [--3way] ... 'git-am' [--skip | --resolved] diff --git a/git-apply.html b/git-apply.html index 7153716a1..ae66a845e 100644 --- a/git-apply.html +++ b/git-apply.html @@ -272,7 +272,10 @@ git-apply(1) Manual Page

SYNOPSIS

-

git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [<patch>…]

+
+
git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] + [--no-add] [--index-info] [--allow-binary-replacement] [-z] + [<patch>…]

DESCRIPTION

@@ -426,7 +429,7 @@ and a work tree.

diff --git a/git-apply.txt b/git-apply.txt index 626e28159..51c7d4709 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -8,7 +8,10 @@ git-apply - Apply patch on a git index file and a work tree SYNOPSIS -------- -'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [...] +[verse] +'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] + [--no-add] [--index-info] [--allow-binary-replacement] [-z] + [...] DESCRIPTION ----------- diff --git a/git-archimport.html b/git-archimport.html index c9046603f..1ef396926 100644 --- a/git-archimport.html +++ b/git-archimport.html @@ -272,15 +272,15 @@ git-archimport(1) Manual Page

SYNOPSIS

-

git-archimport [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ] - [ -D depth ] [ -t tempdir ] - <archive/branch> [ <archive/branch> ]

+
+
git-archimport [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir] + <archive/branch> [ <archive/branch> ]

DESCRIPTION

Imports a project from one or more Arch repositories. It will follow branches and repositories within the namespaces defined by the <archive/branch> -parameters suppplied. If it cannot find the remote branch a merge comes from +parameters supplied. If it cannot find the remote branch a merge comes from it will just import it as a regular commit. If it can find it, it will mark it as a merge whenever possible (see discussion below).

The script expects you to provide the key roots where it can start the import @@ -410,7 +410,7 @@ patches that have been traded out-of-sequence between the branches.

diff --git a/git-archimport.txt b/git-archimport.txt index a2bd788f3..023d3ae7b 100644 --- a/git-archimport.txt +++ b/git-archimport.txt @@ -8,15 +8,15 @@ git-archimport - Import an Arch repository into git SYNOPSIS -------- -`git-archimport` [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ] - [ -D depth ] [ -t tempdir ] - [ ] +[verse] +`git-archimport` [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir] + [ ] DESCRIPTION ----------- Imports a project from one or more Arch repositories. It will follow branches and repositories within the namespaces defined by the -parameters suppplied. If it cannot find the remote branch a merge comes from +parameters supplied. If it cannot find the remote branch a merge comes from it will just import it as a regular commit. If it can find it, it will mark it as a merge whenever possible (see discussion below). diff --git a/git-cat-file.html b/git-cat-file.html index 00b05e3ba..0b071a7c1 100644 --- a/git-cat-file.html +++ b/git-cat-file.html @@ -272,7 +272,7 @@ git-cat-file(1) Manual Page

SYNOPSIS

-

git-cat-file (-t | -s | -e | <type>) <object>

+

git-cat-file [-t | -s | -e | <type>] <object>

DESCRIPTION

@@ -355,7 +355,7 @@ be returned.

diff --git a/git-cat-file.txt b/git-cat-file.txt index 9a7700fa7..504eb1b16 100644 --- a/git-cat-file.txt +++ b/git-cat-file.txt @@ -8,7 +8,7 @@ git-cat-file - Provide content or type information for repository objects SYNOPSIS -------- -'git-cat-file' (-t | -s | -e | ) +'git-cat-file' [-t | -s | -e | ] DESCRIPTION ----------- diff --git a/git-checkout-index.html b/git-checkout-index.html index 68483bd30..00365346a 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -272,8 +272,9 @@ git-checkout-index(1) Manual Page

SYNOPSIS

-

git-checkout-index [-u] [-q] [-a] [-f] [-n] [--prefix=<string>] - [--stage=<number>] [--] <file>…

+
+
git-checkout-index [-u] [-q] [-a] [-f] [-n] [--prefix=<string>] + [--stage=<number>] [--] <file>…

DESCRIPTION

@@ -430,7 +431,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-checkout-index.txt b/git-checkout-index.txt index 9f32c65aa..2a1e526c6 100644 --- a/git-checkout-index.txt +++ b/git-checkout-index.txt @@ -8,8 +8,9 @@ git-checkout-index - Copy files from the index to the working directory SYNOPSIS -------- +[verse] 'git-checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=] - [--stage=] [--] ... + [--stage=] [--] ... DESCRIPTION ----------- diff --git a/git-clone.html b/git-clone.html index f83caa187..3be22fdde 100644 --- a/git-clone.html +++ b/git-clone.html @@ -272,7 +272,9 @@ git-clone(1) Manual Page

SYNOPSIS

-

git-clone [-l [-s]] [-q] [-n] [-o <name>] [-u <upload-pack>] <repository> [<directory>]

+
+
git-clone [-l [-s]] [-q] [-n] [-o <name>] [-u <upload-pack>] + <repository> [<directory>]

DESCRIPTION

@@ -434,7 +436,7 @@ $ git show-branch
diff --git a/git-clone.txt b/git-clone.txt index f943f267d..790b87b23 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -8,7 +8,9 @@ git-clone - Clones a repository. SYNOPSIS -------- -'git-clone' [-l [-s]] [-q] [-n] [-o ] [-u ] [] +[verse] +'git-clone' [-l [-s]] [-q] [-n] [-o ] [-u ] + [] DESCRIPTION ----------- diff --git a/git-commit-tree.html b/git-commit-tree.html index 6e0bc36a2..bcc653b8c 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -344,7 +344,8 @@ GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL

(nb "<", ">" and "\n"s are stripped)

-

In .git/config file, the following items are used:

+

In .git/config file, the following items are used for GIT_AUTHOR_NAME and +GIT_AUTHOR_EMAIL:

[user]
@@ -402,7 +403,7 @@ Your sysadmin must hate you!
diff --git a/git-commit-tree.txt b/git-commit-tree.txt index a794192d7..41d1a1c4b 100644 --- a/git-commit-tree.txt +++ b/git-commit-tree.txt @@ -60,7 +60,8 @@ either `.git/config` file, or using the following environment variables. (nb "<", ">" and "\n"s are stripped) -In `.git/config` file, the following items are used: +In `.git/config` file, the following items are used for GIT_AUTHOR_NAME and +GIT_AUTHOR_EMAIL: [user] name = "Your Name" diff --git a/git-commit.html b/git-commit.html index 7dfc3091e..fb9532e8d 100644 --- a/git-commit.html +++ b/git-commit.html @@ -272,7 +272,9 @@ git-commit(1) Manual Page

SYNOPSIS

-

git-commit [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] [-e] [--] <file>…

+
+
git-commit [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] + [-e] [--] <file>…

DESCRIPTION

@@ -395,7 +397,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index 8b91f221f..e0ff74f64 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -7,7 +7,9 @@ git-commit - Record your changes SYNOPSIS -------- -'git-commit' [-a] [-s] [-v] [(-c | -C) | -F | -m ] [-e] [--] ... +[verse] +'git-commit' [-a] [-s] [-v] [(-c | -C) | -F | -m ] + [-e] [--] ... DESCRIPTION ----------- diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index bf23276c5..ecaa05b39 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -272,8 +272,7 @@ git-cvsexportcommit(1) Manual Page

SYNOPSIS

-

git-cvsexportcommmit.perl - [ -h ] [ -v ] [ -c ] [ -p ] [PARENTCOMMIT] COMMITID

+

git-cvsexportcommmit [-h] [-v] [-c] [-p] [PARENTCOMMIT] COMMITID

DESCRIPTION

@@ -332,7 +331,7 @@ should the changeset be done against.

diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index 91def2b51..13cbf3ba6 100644 --- a/git-cvsexportcommit.txt +++ b/git-cvsexportcommit.txt @@ -8,8 +8,7 @@ git-cvsexportcommit - Export a commit to a CVS checkout SYNOPSIS -------- -git-cvsexportcommmit.perl - [ -h ] [ -v ] [ -c ] [ -p ] [PARENTCOMMIT] COMMITID +'git-cvsexportcommmit' [-h] [-v] [-c] [-p] [PARENTCOMMIT] COMMITID DESCRIPTION diff --git a/git-cvsimport.html b/git-cvsimport.html index b3974f9af..20f90f062 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -272,10 +272,10 @@ git-cvsimport(1) Manual Page

SYNOPSIS

-

git-cvsimport [ -o <branch-for-HEAD> ] [ -h ] [ -v ] - [ -d <CVSROOT> ] [ -p <options-for-cvsps> ] - [ -C <git_repository> ] [ -i ] [ -P <file> ] [ -k ] - [ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]

+
+
git-cvsimport [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>] [-s <subst>] + [-p <options-for-cvsps>] [-C <git_repository>] [-i] [-P <file>] + [-m] [-M regex] [<CVS_module>]

DESCRIPTION

@@ -448,7 +448,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-cvsimport.txt b/git-cvsimport.txt index f89b251e1..01ca7ef96 100644 --- a/git-cvsimport.txt +++ b/git-cvsimport.txt @@ -8,10 +8,10 @@ git-cvsimport - Import a CVS repository into git SYNOPSIS -------- -'git-cvsimport' [ -o ] [ -h ] [ -v ] - [ -d ] [ -p ] - [ -C ] [ -i ] [ -P ] [ -k ] - [ -s ] [ -m ] [ -M regex ] [ ] +[verse] +'git-cvsimport' [-o ] [-h] [-v] [-d ] [-s ] + [-p ] [-C ] [-i] [-P ] + [-m] [-M regex] [] DESCRIPTION diff --git a/git-daemon.html b/git-daemon.html index 7aecf6409..8899db0b4 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -272,8 +272,9 @@ git-daemon(1) Manual Page

SYNOPSIS

-

git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all] - [--timeout=n] [--init-timeout=n] [--strict-paths] [directory…]

+
+
git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all] + [--timeout=n] [--init-timeout=n] [--strict-paths] [directory…]

DESCRIPTION

@@ -393,7 +394,7 @@ the offers to a whitelist comprising of those.

diff --git a/git-daemon.txt b/git-daemon.txt index 2a8f371ec..33f3320e2 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -7,8 +7,9 @@ git-daemon - A really simple server for git repositories. SYNOPSIS -------- +[verse] 'git-daemon' [--verbose] [--syslog] [--inetd | --port=n] [--export-all] - [--timeout=n] [--init-timeout=n] [--strict-paths] [directory...] + [--timeout=n] [--init-timeout=n] [--strict-paths] [directory...] DESCRIPTION ----------- diff --git a/git-diff-files.html b/git-diff-files.html index afe191461..6eea3ada8 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -341,7 +341,7 @@ same as "git-diff-index" and "git-diff-tree".

Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header - lines, show only handful dhexigits prefix. This is + lines, show only handful hexdigits prefix. This is independent of --full-index option above, which controls the diff-patch output format. Non default number of digits can be specified with --abbrev=<n>. @@ -681,7 +681,7 @@ traditional diff format.

  1. -It is preceeded with a "git diff" header, that looks like +It is preceded with a "git diff" header, that looks like this:

    @@ -736,7 +736,7 @@ TAB, LF, and backslash characters in pathnames are
    diff --git a/git-diff-index.html b/git-diff-index.html index e1a787e88..968e3ae50 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -342,7 +342,7 @@ entries in the index are compared.

    Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header - lines, show only handful dhexigits prefix. This is + lines, show only handful hexdigits prefix. This is independent of --full-index option above, which controls the diff-patch output format. Non default number of digits can be specified with --abbrev=<n>. @@ -688,7 +688,7 @@ traditional diff format.

    1. -It is preceeded with a "git diff" header, that looks like +It is preceded with a "git diff" header, that looks like this:

      @@ -745,7 +745,7 @@ of these operations are very useful indeed.

      contents (the ones I'd write with a "git-write-tree")

      For example, let's say that you have worked on your working directory, updated -some files in the index and are ready to commit. You want to see eactly +some files in the index and are ready to commit. You want to see exactly what you are going to commit is without having to write a new tree object and compare it that way, and to do that, you just do

      @@ -807,7 +807,7 @@ directly rather than do an object-to-object diff.

      actually look at the contents of the file at all. So maybe kernel/sched.c hasn't actually changed, and it's just that you touched it. In either case, it's a note that you need to -"git-upate-index" it to make the index be in sync. +"git-update-index" it to make the index be in sync.
      @@ -837,7 +837,7 @@ always have the special all-zero sha1.
      diff --git a/git-diff-index.txt b/git-diff-index.txt index dba6d30fc..5d2096a4c 100644 --- a/git-diff-index.txt +++ b/git-diff-index.txt @@ -53,7 +53,7 @@ If '--cached' is specified, it allows you to ask: contents (the ones I'd write with a "git-write-tree") For example, let's say that you have worked on your working directory, updated -some files in the index and are ready to commit. You want to see eactly +some files in the index and are ready to commit. You want to see exactly *what* you are going to commit is without having to write a new tree object and compare it that way, and to do that, you just do @@ -110,7 +110,7 @@ NOTE: As with other commands of this type, "git-diff-index" does not actually look at the contents of the file at all. So maybe `kernel/sched.c` hasn't actually changed, and it's just that you touched it. In either case, it's a note that you need to -"git-upate-index" it to make the index be in sync. +"git-update-index" it to make the index be in sync. NOTE: You can have a mixture of files show up as "has been updated" and "is still dirty in the working directory" together. You can always diff --git a/git-diff-stages.html b/git-diff-stages.html index c6eba5d69..faf547317 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -339,7 +339,7 @@ unmerged index file.

      Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header - lines, show only handful dhexigits prefix. This is + lines, show only handful hexdigits prefix. This is independent of --full-index option above, which controls the diff-patch output format. Non default number of digits can be specified with --abbrev=<n>. @@ -666,7 +666,7 @@ traditional diff format.

      1. -It is preceeded with a "git diff" header, that looks like +It is preceded with a "git diff" header, that looks like this:

        @@ -721,7 +721,7 @@ TAB, LF, and backslash characters in pathnames are
        diff --git a/git-diff-tree.html b/git-diff-tree.html index 27362c24f..64dcd2306 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -272,7 +272,9 @@ git-diff-tree(1) Manual Page

        SYNOPSIS

        -

        git-diff-tree [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r] [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>…]

        +
        +
        git-diff-tree [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r] + [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>…]

        DESCRIPTION

        @@ -341,7 +343,7 @@ git-diff-tree(1) Manual Page

        Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header - lines, show only handful dhexigits prefix. This is + lines, show only handful hexdigits prefix. This is independent of --full-index option above, which controls the diff-patch output format. Non default number of digits can be specified with --abbrev=<n>. @@ -513,7 +515,7 @@ separated with a single space are given.

        By default, "git-diff-tree --stdin" shows differences, either in machine-readable form (without -p) or in patch - form (with -p). This output can be supressed. It is + form (with -p). This output can be suppressed. It is only useful with -v flag.

        @@ -811,7 +813,7 @@ traditional diff format.

        1. -It is preceeded with a "git diff" header, that looks like +It is preceded with a "git diff" header, that looks like this:

          @@ -866,7 +868,7 @@ TAB, LF, and backslash characters in pathnames are
          diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 9a2947e27..91fb13049 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt @@ -8,7 +8,9 @@ git-diff-tree - Compares the content and mode of blobs found via two tree object SYNOPSIS -------- -'git-diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r] [--root] [] [] [...] +[verse] +'git-diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r] + [--root] [] [] [...] DESCRIPTION ----------- @@ -62,7 +64,7 @@ separated with a single space are given. -s:: By default, "git-diff-tree --stdin" shows differences, either in machine-readable form (without '-p') or in patch - form (with '-p'). This output can be supressed. It is + form (with '-p'). This output can be suppressed. It is only useful with '-v' flag. -v:: diff --git a/git-diff.html b/git-diff.html index a22074c2c..9b374e355 100644 --- a/git-diff.html +++ b/git-diff.html @@ -360,7 +360,7 @@ $ git diff HEAD^ HEAD (3) (1) instead of using the tip of the current branch, compare with the tip of "test" branch. (2) instead of comparing with the tip of "test" branch, compare with -the tip of the curren branch, but limit the comparison to the +the tip of the current branch, but limit the comparison to the file "test". (3) compare the version before the last commit and the last commit.
        @@ -415,7 +415,7 @@ rewrites (very expensive). diff --git a/git-diff.txt b/git-diff.txt index b04f393bc..ca4163402 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -67,7 +67,7 @@ $ git diff HEAD^ HEAD <3> <1> instead of using the tip of the current branch, compare with the tip of "test" branch. <2> instead of comparing with the tip of "test" branch, compare with -the tip of the curren branch, but limit the comparison to the +the tip of the current branch, but limit the comparison to the file "test". <3> compare the version before the last commit and the last commit. ------------ diff --git a/git-format-patch.html b/git-format-patch.html index 3ecdbad5c..9da28602f 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -272,7 +272,9 @@ git-format-patch(1) Manual Page

        SYNOPSIS

        -

        git-format-patch [-n | -k] [-o <dir> | --stdout] [-s] [-c] [--mbox] [--diff-options] <his> [<mine>]

        +
        +
        git-format-patch [-n | -k] [-o <dir> | --stdout] [-s] [-c] [--mbox] + [--diff-options] <his> [<mine>]

        DESCRIPTION

        @@ -414,7 +416,7 @@ git-format-patch -M -B origin

        See Also

        -

        git-am(1), gitlink:git-send-email

        +

        git-am(1), git-send-email(1)

        Author

        @@ -430,7 +432,7 @@ git-format-patch -M -B origin
        diff --git a/git-format-patch.txt b/git-format-patch.txt index d7ca2dbb2..47705de4f 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -8,7 +8,9 @@ git-format-patch - Prepare patches for e-mail submission. SYNOPSIS -------- -'git-format-patch' [-n | -k] [-o | --stdout] [-s] [-c] [--mbox] [--diff-options] [] +[verse] +'git-format-patch' [-n | -k] [-o | --stdout] [-s] [-c] [--mbox] + [--diff-options] [] DESCRIPTION ----------- @@ -96,7 +98,7 @@ git-format-patch -M -B origin:: See Also -------- -gitlink:git-am[1], gitlink:git-send-email +gitlink:git-am[1], gitlink:git-send-email[1] Author diff --git a/git-fsck-objects.html b/git-fsck-objects.html index 515882058..1e7f1aa34 100644 --- a/git-fsck-objects.html +++ b/git-fsck-objects.html @@ -272,7 +272,9 @@ git-fsck-objects(1) Manual Page

        SYNOPSIS

        -

        git-fsck-objects [--tags] [--root] [--unreachable] [--cache] [--standalone | --full] [--strict] [<object>*]

        +
        +
        git-fsck-objects [--tags] [--root] [--unreachable] [--cache] + [--standalone | --full] [--strict] [<object>*]

        DESCRIPTION

        @@ -501,7 +503,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES
        diff --git a/git-fsck-objects.txt b/git-fsck-objects.txt index bab1f6080..387b43548 100644 --- a/git-fsck-objects.txt +++ b/git-fsck-objects.txt @@ -8,7 +8,9 @@ git-fsck-objects - Verifies the connectivity and validity of the objects in the SYNOPSIS -------- -'git-fsck-objects' [--tags] [--root] [--unreachable] [--cache] [--standalone | --full] [--strict] [*] +[verse] +'git-fsck-objects' [--tags] [--root] [--unreachable] [--cache] + [--standalone | --full] [--strict] [*] DESCRIPTION ----------- diff --git a/git-grep.html b/git-grep.html index a4c233f24..fcf212772 100644 --- a/git-grep.html +++ b/git-grep.html @@ -272,7 +272,7 @@ git-grep(1) Manual Page

        SYNOPSIS

        -

        git-grep <option>… <pattern> <path>…

        +

        git-grep [<option>…] <pattern> [<path>…]

        DESCRIPTION

        @@ -325,7 +325,7 @@ containing a match to the given pattern.

        diff --git a/git-grep.txt b/git-grep.txt index 017579348..2bfd8edbc 100644 --- a/git-grep.txt +++ b/git-grep.txt @@ -8,7 +8,7 @@ git-grep - print lines matching a pattern SYNOPSIS -------- -'git-grep'