From: Junio C Hamano Date: Fri, 19 Jan 2007 00:37:50 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.0-rc1-g72fe X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7c73c663897cfb2796fa93efc40ebe4ea33a3db1;p=git.git Autogenerated HTML docs for v1.5.0-rc1-g72fe --- diff --git a/cmds-ancillaryinterrogators.txt b/cmds-ancillaryinterrogators.txt new file mode 100644 index 000000000..7398348d1 --- /dev/null +++ b/cmds-ancillaryinterrogators.txt @@ -0,0 +1,63 @@ +gitlink:git-annotate[1]:: + Annotate file lines with commit info. + +gitlink:git-blame[1]:: + Show what revision and author last modified each line of a file. + +gitlink:git-check-ref-format[1]:: + Make sure ref name is well formed. + +gitlink:git-cherry[1]:: + Find commits not merged upstream. + +gitlink:git-count-objects[1]:: + Count unpacked number of objects and their disk consumption. + +gitlink:git-daemon[1]:: + A really simple server for git repositories. + +gitlink:git-fmt-merge-msg[1]:: + Produce a merge commit message. + +gitlink:git-get-tar-commit-id[1]:: + Extract commit ID from an archive created using git-tar-tree. + +gitlink:git-imap-send[1]:: + Dump a mailbox from stdin into an imap folder. + +gitlink:git-instaweb[1]:: + Instantly browse your working repository in gitweb. + +gitlink:git-mailinfo[1]:: + Extracts patch and authorship from a single e-mail message. + +gitlink:git-mailsplit[1]:: + Simple UNIX mbox splitter program. + +gitlink:git-merge-tree[1]:: + Show three-way merge without touching index. + +gitlink:git-parse-remote[1]:: + Routines to help parsing remote repository access parameters. + +gitlink:git-patch-id[1]:: + Compute unique ID for a patch. + +gitlink:git-request-pull[1]:: + Generates a summary of pending changes. + +gitlink:git-rev-parse[1]:: + Pick out and massage parameters. + +gitlink:git-runstatus[1]:: + A helper for git-status and git-commit. + +gitlink:git-send-email[1]:: + Send a collection of patches as emails. + +gitlink:git-stripspace[1]:: + Filter out empty lines. + +gitlink:git-symbolic-ref[1]:: + Read and modify symbolic refs. + diff --git a/cmds-ancillarymanipulators.txt b/cmds-ancillarymanipulators.txt new file mode 100644 index 000000000..638a132ae --- /dev/null +++ b/cmds-ancillarymanipulators.txt @@ -0,0 +1,57 @@ +gitlink:git-applypatch[1]:: + Apply one patch extracted from an e-mail. + +gitlink:git-archimport[1]:: + Import an Arch repository into git. + +gitlink:git-convert-objects[1]:: + Converts old-style git repository. + +gitlink:git-cvsexportcommit[1]:: + Export a single commit to a CVS checkout. + +gitlink:git-cvsimport[1]:: + Salvage your data out of another SCM people love to hate. + +gitlink:git-cvsserver[1]:: + A CVS server emulator for git. + +gitlink:git-gc[1]:: + Cleanup unnecessary files and optimize the local repository. + +gitlink:git-lost-found[1]:: + Recover lost refs that luckily have not yet been pruned. + +gitlink:git-merge-one-file[1]:: + The standard helper program to use with git-merge-index. + +gitlink:git-prune[1]:: + Prunes all unreachable objects from the object database. + +gitlink:git-quiltimport[1]:: + Applies a quilt patchset onto the current branch. + +gitlink:git-reflog[1]:: + Manage reflog information. + +gitlink:git-relink[1]:: + Hardlink common objects in local repositories. + +gitlink:git-sh-setup[1]:: + Common git shell script setup code. + +gitlink:git-svn[1]:: + Bidirectional operation between a single Subversion branch and git. + +gitlink:git-svnimport[1]:: + Import a SVN repository into git. + +gitlink:git-symbolic-ref[1]:: + Read and modify symbolic refs. + +gitlink:git-tag[1]:: + Create or verify a tag object signed with GPG. + +gitlink:git-update-ref[1]:: + Update the object name stored in a ref safely. + diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt new file mode 100644 index 000000000..05c5965dc --- /dev/null +++ b/cmds-mainporcelain.txt @@ -0,0 +1,108 @@ +gitlink:git-add[1]:: + Add file contents to the changeset to be committed next. + +gitlink:git-am[1]:: + Apply a series of patches from a mailbox. + +gitlink:git-applymbox[1]:: + Apply a series of patches in a mailbox. + +gitlink:git-archive[1]:: + Creates an archive of files from a named tree. + +gitlink:git-bisect[1]:: + Find the change that introduced a bug by binary search. + +gitlink:git-branch[1]:: + List, create, or delete branches. + +gitlink:git-checkout[1]:: + Checkout and switch to a branch. + +gitlink:git-cherry-pick[1]:: + Apply the change introduced by an existing commit. + +gitlink:git-clean[1]:: + Remove untracked files from the working tree. + +gitlink:git-clone[1]:: + Clones a repository into a new directory. + +gitlink:git-commit[1]:: + Record changes to the repository. + +gitlink:git-diff[1]:: + Show changes between commits, commit and working tree, etc. + +gitlink:git-fetch[1]:: + Download objects and refs from another repository. + +gitlink:git-format-patch[1]:: + Prepare patches for e-mail submission. + +gitlink:git-grep[1]:: + Print lines matching a pattern. + +gitlink:gitk[1]:: + The git repository browser. + +gitlink:git-log[1]:: + Show commit logs. + +gitlink:git-ls-remote[1]:: + List references in a remote repository. + +gitlink:git-merge[1]:: + Join two or more development histories together. + +gitlink:git-mv[1]:: + Move or rename a file, a directory, or a symlink. + +gitlink:git-pack-refs[1]:: + Pack heads and tags for efficient repository access. + +gitlink:git-pull[1]:: + Fetch from and merge with another repository or a local branch. + +gitlink:git-push[1]:: + Update remote refs along with associated objects. + +gitlink:git-rebase[1]:: + Forward-port local commits to the updated upstream head. + +gitlink:git-repack[1]:: + Pack unpacked objects in a repository. + +gitlink:git-rerere[1]:: + Reuse recorded resolution of conflicted merges. + +gitlink:git-reset[1]:: + Reset current HEAD to the specified state. + +gitlink:git-resolve[1]:: + Merge two commits. + +gitlink:git-revert[1]:: + Revert an existing commit. + +gitlink:git-rm[1]:: + Remove files from the working tree and from the index. + +gitlink:git-shortlog[1]:: + Summarize 'git log' output. + +gitlink:git-show[1]:: + Show various types of objects. + +gitlink:git-show-branch[1]:: + Show branches and their commits. + +gitlink:git-status[1]:: + Show the working tree status. + +gitlink:git-verify-tag[1]:: + Check the GPG signature of tag. + +gitlink:git-whatchanged[1]:: + Show logs with difference each commit introduces. + diff --git a/cmds-plumbinginterrogators.txt b/cmds-plumbinginterrogators.txt new file mode 100644 index 000000000..28580eae9 --- /dev/null +++ b/cmds-plumbinginterrogators.txt @@ -0,0 +1,60 @@ +gitlink:git-cat-file[1]:: + Provide content or type/size information for repository objects. + +gitlink:git-describe[1]:: + Show the most recent tag that is reachable from a commit. + +gitlink:git-diff-files[1]:: + Compares files in the working tree and the index. + +gitlink:git-diff-index[1]:: + Compares content and mode of blobs between the index and repository. + +gitlink:git-diff-stages[1]:: + Compares two merge stages in the index. + +gitlink:git-diff-tree[1]:: + Compares the content and mode of blobs found via two tree objects. + +gitlink:git-for-each-ref[1]:: + Output information on each ref. + +gitlink:git-fsck-objects[1]:: + Verifies the connectivity and validity of the objects in the database. + +gitlink:git-ls-files[1]:: + Show information about files in the index and the working tree. + +gitlink:git-ls-tree[1]:: + List the contents of a tree object. + +gitlink:git-merge-base[1]:: + Find as good common ancestors as possible for a merge. + +gitlink:git-name-rev[1]:: + Find symbolic names for given revs. + +gitlink:git-pack-redundant[1]:: + Find redundant pack files. + +gitlink:git-rev-list[1]:: + Lists commit objects in reverse chronological order. + +gitlink:git-show-index[1]:: + Show packed archive index. + +gitlink:git-show-ref[1]:: + List references in a local repository. + +gitlink:git-tar-tree[1]:: + Create a tar archive of the files in the named tree object. + +gitlink:git-unpack-file[1]:: + Creates a temporary file with a blob's contents. + +gitlink:git-var[1]:: + Show a git logical variable. + +gitlink:git-verify-pack[1]:: + Validate packed git archive files. + diff --git a/cmds-plumbingmanipulators.txt b/cmds-plumbingmanipulators.txt new file mode 100644 index 000000000..436387710 --- /dev/null +++ b/cmds-plumbingmanipulators.txt @@ -0,0 +1,51 @@ +gitlink:git-apply[1]:: + Apply a patch on a git index file and a working tree. + +gitlink:git-checkout-index[1]:: + Copy files from the index to the working tree. + +gitlink:git-commit-tree[1]:: + Create a new commit object. + +gitlink:git-hash-object[1]:: + Compute object ID and optionally creates a blob from a file. + +gitlink:git-index-pack[1]:: + Build pack index file for an existing packed archive. + +gitlink:git-init[1]:: + Create an empty git repository or reinitialize an existing one. + +gitlink:git-merge-file[1]:: + Run a three-way file merge. + +gitlink:git-merge-index[1]:: + Run a merge for files needing merging. + +gitlink:git-mktag[1]:: + Creates a tag object. + +gitlink:git-mktree[1]:: + Build a tree-object from ls-tree formatted text. + +gitlink:git-pack-objects[1]:: + Create a packed archive of objects. + +gitlink:git-prune-packed[1]:: + Remove extra objects that are already in pack files. + +gitlink:git-read-tree[1]:: + Reads tree information into the index. + +gitlink:git-repo-config[1]:: + Get and set repository or global options. + +gitlink:git-unpack-objects[1]:: + Unpack objects from a packed archive. + +gitlink:git-update-index[1]:: + Register file contents in the working tree to the index. + +gitlink:git-write-tree[1]:: + Create a tree object from the current index. + diff --git a/cmds-synchingrepositories.txt b/cmds-synchingrepositories.txt new file mode 100644 index 000000000..01b5bb992 --- /dev/null +++ b/cmds-synchingrepositories.txt @@ -0,0 +1,39 @@ +gitlink:git-fetch-pack[1]:: + Receive missing objects from another repository. + +gitlink:git-http-fetch[1]:: + Download from a remote git repository via HTTP. + +gitlink:git-http-push[1]:: + Push objects over HTTP/DAV to another repository. + +gitlink:git-local-fetch[1]:: + Duplicate another git repository on a local system. + +gitlink:git-peek-remote[1]:: + List the references in a remote repository. + +gitlink:git-receive-pack[1]:: + Receive what is pushed into the repository. + +gitlink:git-send-pack[1]:: + Push objects over git protocol to another reposiotory. + +gitlink:git-shell[1]:: + Restricted login shell for GIT-only SSH access. + +gitlink:git-ssh-fetch[1]:: + Fetch from a remote repository over ssh connection. + +gitlink:git-ssh-upload[1]:: + Push to a remote repository over ssh connection. + +gitlink:git-update-server-info[1]:: + Update auxiliary info file to help dumb servers. + +gitlink:git-upload-archive[1]:: + Send archive back to git-archive. + +gitlink:git-upload-pack[1]:: + Send objects packed back to git-fetch-pack. + diff --git a/git-am.html b/git-am.html index c06f394cf..2a3c89415 100644 --- a/git-am.html +++ b/git-am.html @@ -266,7 +266,7 @@ git-am(1) Manual Page

NAME

git-am - - Apply a series of patches in a mailbox + Apply a series of patches from a mailbox

@@ -440,7 +440,7 @@ names.

diff --git a/git-am.txt b/git-am.txt index 53e81cb10..aa4ce1ddb 100644 --- a/git-am.txt +++ b/git-am.txt @@ -3,7 +3,7 @@ git-am(1) NAME ---- -git-am - Apply a series of patches in a mailbox +git-am - Apply a series of patches from a mailbox SYNOPSIS diff --git a/git-apply.html b/git-apply.html index 39605a61f..1bb8a7623 100644 --- a/git-apply.html +++ b/git-apply.html @@ -266,7 +266,7 @@ git-apply(1) Manual Page

NAME

git-apply - - Apply patch on a git index file and a work tree + Apply a patch on a git index file and a working tree

@@ -583,7 +583,7 @@ apply.whitespace diff --git a/git-apply.txt b/git-apply.txt index 33b93db50..065ba1bf2 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -3,7 +3,7 @@ git-apply(1) NAME ---- -git-apply - Apply patch on a git index file and a work tree +git-apply - Apply a patch on a git index file and a working tree SYNOPSIS diff --git a/git-archive.html b/git-archive.html index 8277f7f92..223e6296d 100644 --- a/git-archive.html +++ b/git-archive.html @@ -266,7 +266,7 @@ git-archive(1) Manual Page

NAME

git-archive - - Creates a archive of the files in the named tree + Creates an archive of files from a named tree

@@ -444,7 +444,7 @@ git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-d diff --git a/git-archive.txt b/git-archive.txt index 031fcd519..493474b2e 100644 --- a/git-archive.txt +++ b/git-archive.txt @@ -3,7 +3,7 @@ git-archive(1) NAME ---- -git-archive - Creates a archive of the files in the named tree +git-archive - Creates an archive of files from a named tree SYNOPSIS diff --git a/git-bisect.html b/git-bisect.html index 9e74990cc..cbf72abe9 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -266,7 +266,7 @@ git-bisect(1) Manual Page

NAME

git-bisect - - Find the change that introduced a bug + Find the change that introduced a bug by binary search

@@ -385,7 +385,7 @@ like this:

diff --git a/git-bisect.txt b/git-bisect.txt index ac4b4965a..16ec7269b 100644 --- a/git-bisect.txt +++ b/git-bisect.txt @@ -3,7 +3,7 @@ git-bisect(1) NAME ---- -git-bisect - Find the change that introduced a bug +git-bisect - Find the change that introduced a bug by binary search SYNOPSIS diff --git a/git-branch.html b/git-branch.html index 3b459e6d7..51e171acc 100644 --- a/git-branch.html +++ b/git-branch.html @@ -266,7 +266,7 @@ git-branch(1) Manual Page

NAME

git-branch - - List, create, or delete branches. + List, create, or delete branches

@@ -511,7 +511,7 @@ a branch and check it out with a single command.

diff --git a/git-branch.txt b/git-branch.txt index d5f811826..aa1fdd402 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -3,7 +3,7 @@ git-branch(1) NAME ---- -git-branch - List, create, or delete branches. +git-branch - List, create, or delete branches SYNOPSIS -------- diff --git a/git-cat-file.html b/git-cat-file.html index a7e9f78d2..d3f4d7813 100644 --- a/git-cat-file.html +++ b/git-cat-file.html @@ -266,7 +266,7 @@ git-cat-file(1) Manual Page

NAME

git-cat-file - - Provide content or type information for repository objects + Provide content or type/size information for repository objects

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

diff --git a/git-cat-file.txt b/git-cat-file.txt index 5e9cbf875..7e90ce91b 100644 --- a/git-cat-file.txt +++ b/git-cat-file.txt @@ -3,7 +3,7 @@ git-cat-file(1) NAME ---- -git-cat-file - Provide content or type information for repository objects +git-cat-file - Provide content or type/size information for repository objects SYNOPSIS diff --git a/git-checkout-index.html b/git-checkout-index.html index 822b0cf74..1116e5170 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -266,7 +266,7 @@ git-checkout-index(1) Manual Page

NAME

git-checkout-index - - Copy files from the index to the working directory + Copy files from the index to the working tree

@@ -511,7 +511,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 765c173e1..6dd6db04b 100644 --- a/git-checkout-index.txt +++ b/git-checkout-index.txt @@ -3,7 +3,7 @@ git-checkout-index(1) NAME ---- -git-checkout-index - Copy files from the index to the working directory +git-checkout-index - Copy files from the index to the working tree SYNOPSIS diff --git a/git-clone.html b/git-clone.html index ff87a1cf7..3aab15d54 100644 --- a/git-clone.html +++ b/git-clone.html @@ -266,7 +266,7 @@ git-clone(1) Manual Page

NAME

git-clone - - Clones a repository + Clones a repository into a new directory

@@ -521,7 +521,7 @@ Create a repository on the kernel.org machine that borrows from Linus diff --git a/git-clone.txt b/git-clone.txt index a78207461..707376f22 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -3,7 +3,7 @@ git-clone(1) NAME ---- -git-clone - Clones a repository +git-clone - Clones a repository into a new directory SYNOPSIS diff --git a/git-commit-tree.html b/git-commit-tree.html index c40f13d27..d74d76018 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -266,7 +266,7 @@ git-commit-tree(1) Manual Page

NAME

git-commit-tree - - Creates a new commit object + Create a new commit object

@@ -480,7 +480,7 @@ reversible operation.

diff --git a/git-commit-tree.txt b/git-commit-tree.txt index f5d8050c9..cf25507f8 100644 --- a/git-commit-tree.txt +++ b/git-commit-tree.txt @@ -3,7 +3,7 @@ git-commit-tree(1) NAME ---- -git-commit-tree - Creates a new commit object +git-commit-tree - Create a new commit object SYNOPSIS diff --git a/git-commit.html b/git-commit.html index 86d3abfe3..67414b074 100644 --- a/git-commit.html +++ b/git-commit.html @@ -266,7 +266,7 @@ git-commit(1) Manual Page

NAME

git-commit - - Record your changes + Record changes to the repository

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

diff --git a/git-commit.txt b/git-commit.txt index bd1c22b31..532703a67 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -3,7 +3,7 @@ git-commit(1) NAME ---- -git-commit - Record your changes +git-commit - Record changes to the repository SYNOPSIS -------- diff --git a/git-count-objects.html b/git-count-objects.html index b09d7db8c..b32f19b56 100644 --- a/git-count-objects.html +++ b/git-count-objects.html @@ -266,7 +266,7 @@ git-count-objects(1) Manual Page

NAME

git-count-objects - - Reports on unpacked objects + Count unpacked number of objects and their disk consumption

@@ -309,7 +309,7 @@ them, to help you decide when it is a good time to repack.

diff --git a/git-count-objects.txt b/git-count-objects.txt index c59df6438..91c8c92c7 100644 --- a/git-count-objects.txt +++ b/git-count-objects.txt @@ -3,7 +3,7 @@ git-count-objects(1) NAME ---- -git-count-objects - Reports on unpacked objects +git-count-objects - Count unpacked number of objects and their disk consumption SYNOPSIS -------- diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index 0447fa0f3..f84d40423 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -266,7 +266,7 @@ git-cvsexportcommit(1) Manual Page

NAME

git-cvsexportcommit - - Export a commit to a CVS checkout + Export a single commit to a CVS checkout

@@ -386,7 +386,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index 092d0d673..347cbcec3 100644 --- a/git-cvsexportcommit.txt +++ b/git-cvsexportcommit.txt @@ -3,7 +3,7 @@ git-cvsexportcommit(1) NAME ---- -git-cvsexportcommit - Export a commit to a CVS checkout +git-cvsexportcommit - Export a single commit to a CVS checkout SYNOPSIS diff --git a/git-cvsimport.html b/git-cvsimport.html index 838f72fd2..6cb109f91 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -266,7 +266,7 @@ git-cvsimport(1) Manual Page

NAME

git-cvsimport - - Import a CVS repository into git + Salvage your data out of another SCM people love to hate

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

diff --git a/git-cvsimport.txt b/git-cvsimport.txt index 44713949a..f5450de74 100644 --- a/git-cvsimport.txt +++ b/git-cvsimport.txt @@ -3,7 +3,7 @@ git-cvsimport(1) NAME ---- -git-cvsimport - Import a CVS repository into git +git-cvsimport - Salvage your data out of another SCM people love to hate SYNOPSIS diff --git a/git-diff-stages.html b/git-diff-stages.html index 60d7cadc8..1cefce391 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -266,7 +266,7 @@ git-diff-stages(1) Manual Page

NAME

git-diff-stages - - Compares content and mode of blobs between stages in an unmerged index file + Compares two merge stages in the index

@@ -960,7 +960,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-stages.txt b/git-diff-stages.txt index 327391862..120d14e87 100644 --- a/git-diff-stages.txt +++ b/git-diff-stages.txt @@ -3,7 +3,7 @@ git-diff-stages(1) NAME ---- -git-diff-stages - Compares content and mode of blobs between stages in an unmerged index file +git-diff-stages - Compares two merge stages in the index SYNOPSIS diff --git a/git-fetch.html b/git-fetch.html index 4b108f597..e14e07335 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -266,7 +266,7 @@ git-fetch(1) Manual Page

NAME

git-fetch - - Download objects and a head from another repository + Download objects and refs from another repository

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

diff --git a/git-fetch.txt b/git-fetch.txt index a9e86fd26..7ecf2408d 100644 --- a/git-fetch.txt +++ b/git-fetch.txt @@ -3,7 +3,7 @@ git-fetch(1) NAME ---- -git-fetch - Download objects and a head from another repository +git-fetch - Download objects and refs from another repository SYNOPSIS diff --git a/git-format-patch.html b/git-format-patch.html index 133b40e3c..7c1d2875d 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -276,6 +276,7 @@ git-format-patch(1) Manual Page
git-format-patch [-n | -k] [-o <dir> | --stdout] [--attach] [--thread] [-s | --signoff] [--diff-options] [--start-number <n>] [--in-reply-to=Message-Id] [--suffix=.<sfx>] + [--ignore-if-in-upstream] <since>[..<until>]

DESCRIPTION

@@ -385,13 +386,25 @@ reference.

+--ignore-if-in-upstream +
+
+

+ Do not include a patch that matches a commit in + <until>..<since>. This will examine all patches reachable + from <since> but not from <until> and compare them with the + patches being generated, and any patch that matches is + ignored. +

+
+
--suffix=.<sfx>

- Instead of using .txt as the suffix for generated + Instead of using .patch as the suffix for generated filenames, use specifed suffix. A common alternative is - --suffix=.patch. + --suffix=.txt.

Note that you would need to include the leading dot . if you want a filename like 0001-description-of-my-change.patch, and @@ -403,15 +416,13 @@ not add any suffix.

CONFIGURATION

You can specify extra mail header lines to be added to each -message in the repository configuration as follows:

-
-
-
headers = "Organization: git-foo\n"
-
-

You can specify default suffix used:

-
+message in the repository configuration. Also you can specify +the default suffix different from the built-in one:

+
-
suffix = .patch
+
[format]
+        headers = "Organization: git-foo\n"
+        suffix = .txt

EXAMPLES

@@ -451,6 +462,15 @@ git-format-patch -M -B origin the recipient uses git to apply your patch.

+
+git-format-patch -3 +
+
+

+ Extract three topmost commits from the current branch + and format them as e-mailable patches. +

+

See Also

@@ -471,7 +491,7 @@ git-format-patch -M -B origin diff --git a/git-format-patch.txt b/git-format-patch.txt index 574cf76dc..59f34b9f0 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -12,6 +12,7 @@ SYNOPSIS 'git-format-patch' [-n | -k] [-o | --stdout] [--attach] [--thread] [-s | --signoff] [--diff-options] [--start-number ] [--in-reply-to=Message-Id] [--suffix=.] + [--ignore-if-in-upstream] [..] DESCRIPTION @@ -80,10 +81,17 @@ OPTIONS reply to the given Message-Id, which avoids breaking threads to provide a new patch series. +--ignore-if-in-upstream:: + Do not include a patch that matches a commit in + ... This will examine all patches reachable + from but not from and compare them with the + patches being generated, and any patch that matches is + ignored. + --suffix=.:: - Instead of using `.txt` as the suffix for generated + Instead of using `.patch` as the suffix for generated filenames, use specifed suffix. A common alternative is - `--suffix=.patch`. + `--suffix=.txt`. + Note that you would need to include the leading dot `.` if you want a filename like `0001-description-of-my-change.patch`, and @@ -93,15 +101,14 @@ not add any suffix. CONFIGURATION ------------- You can specify extra mail header lines to be added to each -message in the repository configuration as follows: +message in the repository configuration. Also you can specify +the default suffix different from the built-in one: +------------ [format] headers = "Organization: git-foo\n" - -You can specify default suffix used: - -[format] - suffix = .patch + suffix = .txt +------------ EXAMPLES @@ -126,6 +133,9 @@ git-format-patch -M -B origin:: understand renaming patches, so use it only when you know the recipient uses git to apply your patch. +git-format-patch -3:: + Extract three topmost commits from the current branch + and format them as e-mailable patches. See Also -------- diff --git a/git-hash-object.html b/git-hash-object.html index f3097ebaa..6092e5c3f 100644 --- a/git-hash-object.html +++ b/git-hash-object.html @@ -266,7 +266,7 @@ git-hash-object(1) Manual Page

NAME

git-hash-object - - Computes object ID and optionally creates a blob from a file + Compute object ID and optionally creates a blob from a file

@@ -327,7 +327,7 @@ specified, it defaults to "blob".

diff --git a/git-hash-object.txt b/git-hash-object.txt index 04e8d0043..5edc36f06 100644 --- a/git-hash-object.txt +++ b/git-hash-object.txt @@ -3,7 +3,7 @@ git-hash-object(1) NAME ---- -git-hash-object - Computes object ID and optionally creates a blob from a file +git-hash-object - Compute object ID and optionally creates a blob from a file SYNOPSIS diff --git a/git-http-fetch.html b/git-http-fetch.html index 39a2d246f..bf45f29a0 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html @@ -266,7 +266,7 @@ git-http-fetch(1) Manual Page

NAME

git-http-fetch - - downloads a remote git repository via HTTP + Download from a remote git repository via HTTP

@@ -360,7 +360,7 @@ commit-id diff --git a/git-http-fetch.txt b/git-http-fetch.txt index 3d508094a..7dc2df304 100644 --- a/git-http-fetch.txt +++ b/git-http-fetch.txt @@ -3,7 +3,7 @@ git-http-fetch(1) NAME ---- -git-http-fetch - downloads a remote git repository via HTTP +git-http-fetch - Download from a remote git repository via HTTP SYNOPSIS diff --git a/git-http-push.html b/git-http-push.html index a8f8ab6cb..0acd29c02 100644 --- a/git-http-push.html +++ b/git-http-push.html @@ -266,7 +266,7 @@ git-http-push(1) Manual Page

NAME

git-http-push - - Push missing objects using HTTP/DAV + Push objects over HTTP/DAV to another repository

@@ -385,7 +385,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-http-push.txt b/git-http-push.txt index c2485c6e9..4b4a46169 100644 --- a/git-http-push.txt +++ b/git-http-push.txt @@ -3,7 +3,7 @@ git-http-push(1) NAME ---- -git-http-push - Push missing objects using HTTP/DAV +git-http-push - Push objects over HTTP/DAV to another repository SYNOPSIS diff --git a/git-init.html b/git-init.html index badaeb5f2..cd51d3ebf 100644 --- a/git-init.html +++ b/git-init.html @@ -266,7 +266,7 @@ git-init(1) Manual Page

NAME

git-init - - Creates an empty git repository + Create an empty git repository or reinitialize an existing one

@@ -395,7 +395,7 @@ add all existing file to the index diff --git a/git-init.txt b/git-init.txt index 596b567c9..1b64d3ab0 100644 --- a/git-init.txt +++ b/git-init.txt @@ -3,7 +3,7 @@ git-init(1) NAME ---- -git-init - Creates an empty git repository +git-init - Create an empty git repository or reinitialize an existing one SYNOPSIS diff --git a/git-instaweb.html b/git-instaweb.html index a8be79243..4138987db 100644 --- a/git-instaweb.html +++ b/git-instaweb.html @@ -266,7 +266,7 @@ git-instaweb(1) Manual Page

NAME

git-instaweb - - instantly browse your working repository in gitweb + Instantly browse your working repository in gitweb

@@ -388,7 +388,7 @@ repository.

diff --git a/git-instaweb.txt b/git-instaweb.txt index 7dd393b97..52a6aa6e8 100644 --- a/git-instaweb.txt +++ b/git-instaweb.txt @@ -3,7 +3,7 @@ git-instaweb(1) NAME ---- -git-instaweb - instantly browse your working repository in gitweb +git-instaweb - Instantly browse your working repository in gitweb SYNOPSIS -------- diff --git a/git-local-fetch.html b/git-local-fetch.html index ed8a57a3b..053707ad7 100644 --- a/git-local-fetch.html +++ b/git-local-fetch.html @@ -266,7 +266,7 @@ git-local-fetch(1) Manual Page

NAME

git-local-fetch - - Duplicates another git repository on a local system + Duplicate another git repository on a local system

@@ -351,7 +351,7 @@ git-local-fetch(1) Manual Page diff --git a/git-local-fetch.txt b/git-local-fetch.txt index 2fbdfe086..22048d82b 100644 --- a/git-local-fetch.txt +++ b/git-local-fetch.txt @@ -3,7 +3,7 @@ git-local-fetch(1) NAME ---- -git-local-fetch - Duplicates another git repository on a local system +git-local-fetch - Duplicate another git repository on a local system SYNOPSIS diff --git a/git-ls-files.html b/git-ls-files.html index c12f43f83..c09e17789 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -266,7 +266,7 @@ git-ls-files(1) Manual Page

NAME

git-ls-files - - Information about files in the index/working directory + Show information about files in the index and the working tree

@@ -688,7 +688,7 @@ from getting ignored.

diff --git a/git-ls-files.txt b/git-ls-files.txt index 8520b9711..79e0b7b71 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -3,7 +3,7 @@ git-ls-files(1) NAME ---- -git-ls-files - Information about files in the index/working directory +git-ls-files - Show information about files in the index and the working tree SYNOPSIS diff --git a/git-ls-tree.html b/git-ls-tree.html index 19ab13b18..d5ef8460a 100644 --- a/git-ls-tree.html +++ b/git-ls-tree.html @@ -266,7 +266,7 @@ git-ls-tree(1) Manual Page

NAME

git-ls-tree - - Lists the contents of a tree object + List the contents of a tree object

@@ -397,7 +397,7 @@ another major rewrite by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-ls-tree.txt b/git-ls-tree.txt index f283bacb6..789939408 100644 --- a/git-ls-tree.txt +++ b/git-ls-tree.txt @@ -3,7 +3,7 @@ git-ls-tree(1) NAME ---- -git-ls-tree - Lists the contents of a tree object +git-ls-tree - List the contents of a tree object SYNOPSIS diff --git a/git-mailinfo.html b/git-mailinfo.html index a0d11a5cb..7a1b7f74d 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -266,7 +266,7 @@ git-mailinfo(1) Manual Page

NAME

git-mailinfo - - Extracts patch from a single e-mail message + Extracts patch and authorship from a single e-mail message

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

diff --git a/git-mailinfo.txt b/git-mailinfo.txt index 1ff6e7d6c..ba18133ea 100644 --- a/git-mailinfo.txt +++ b/git-mailinfo.txt @@ -3,7 +3,7 @@ git-mailinfo(1) NAME ---- -git-mailinfo - Extracts patch from a single e-mail message +git-mailinfo - Extracts patch and authorship from a single e-mail message SYNOPSIS diff --git a/git-mailsplit.html b/git-mailsplit.html index 3d9e56535..3d3ab7eec 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html @@ -266,7 +266,7 @@ git-mailsplit(1) Manual Page

NAME

git-mailsplit - - Totally braindamaged mbox splitter program + Simple UNIX mbox splitter program

@@ -344,7 +344,7 @@ and Junio C Hamano <junkio@cox.net>

diff --git a/git-mailsplit.txt b/git-mailsplit.txt index 5a17801f6..c11d6a530 100644 --- a/git-mailsplit.txt +++ b/git-mailsplit.txt @@ -3,7 +3,7 @@ git-mailsplit(1) NAME ---- -git-mailsplit - Totally braindamaged mbox splitter program +git-mailsplit - Simple UNIX mbox splitter program SYNOPSIS -------- diff --git a/git-merge-base.html b/git-merge-base.html index d2a1e64fe..4d55d7fd1 100644 --- a/git-merge-base.html +++ b/git-merge-base.html @@ -266,7 +266,7 @@ git-merge-base(1) Manual Page

NAME

git-merge-base - - Finds as good a common ancestor as possible for a merge + Find as good common ancestors as possible for a merge

@@ -312,7 +312,7 @@ relied on to decide in any particular way.

diff --git a/git-merge-base.txt b/git-merge-base.txt index 6099be2ad..3190aed10 100644 --- a/git-merge-base.txt +++ b/git-merge-base.txt @@ -3,7 +3,7 @@ git-merge-base(1) NAME ---- -git-merge-base - Finds as good a common ancestor as possible for a merge +git-merge-base - Find as good common ancestors as possible for a merge SYNOPSIS diff --git a/git-merge-file.html b/git-merge-file.html index e74295b3d..f5b6c94c3 100644 --- a/git-merge-file.html +++ b/git-merge-file.html @@ -266,7 +266,7 @@ git-merge-file(1) Manual Page

NAME

git-merge-file - - three-way file merge + Run a three-way file merge

@@ -377,7 +377,7 @@ with parts copied from the original documentation of RCS merge.

diff --git a/git-merge-file.txt b/git-merge-file.txt index 29d3faa55..31882abb8 100644 --- a/git-merge-file.txt +++ b/git-merge-file.txt @@ -3,7 +3,7 @@ git-merge-file(1) NAME ---- -git-merge-file - three-way file merge +git-merge-file - Run a three-way file merge SYNOPSIS diff --git a/git-merge-index.html b/git-merge-index.html index e7eeeaff0..ebe9fa11e 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -266,7 +266,7 @@ git-merge-index(1) Manual Page

NAME

git-merge-index - - Runs a merge for files needing merging + Run a merge for files needing merging

@@ -372,7 +372,7 @@ One-shot merge by Petr Baudis <pasky@ucw.cz>

diff --git a/git-merge-index.txt b/git-merge-index.txt index 0cf505ea8..b8ee1ff2b 100644 --- a/git-merge-index.txt +++ b/git-merge-index.txt @@ -3,7 +3,7 @@ git-merge-index(1) NAME ---- -git-merge-index - Runs a merge for files needing merging +git-merge-index - Run a merge for files needing merging SYNOPSIS diff --git a/git-merge-one-file.html b/git-merge-one-file.html index 4d41669d0..f61f8b2da 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html @@ -266,7 +266,7 @@ git-merge-one-file(1) Manual Page

NAME

git-merge-one-file - - The standard helper program to use with "git-merge-index" + The standard helper program to use with git-merge-index

@@ -294,7 +294,7 @@ Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.

diff --git a/git-merge-one-file.txt b/git-merge-one-file.txt index 86aad37c6..f80ab3b8c 100644 --- a/git-merge-one-file.txt +++ b/git-merge-one-file.txt @@ -3,7 +3,7 @@ git-merge-one-file(1) NAME ---- -git-merge-one-file - The standard helper program to use with "git-merge-index" +git-merge-one-file - The standard helper program to use with git-merge-index SYNOPSIS diff --git a/git-merge.html b/git-merge.html index 55511d493..2426cac1b 100644 --- a/git-merge.html +++ b/git-merge.html @@ -266,7 +266,7 @@ git-merge(1) Manual Page

NAME

git-merge - - Grand Unified Merge Driver + Join two or more development histories together

@@ -570,7 +570,7 @@ Resolve the conflicts. git-diff would report only the diff --git a/git-merge.txt b/git-merge.txt index 0f79665ea..3c08a6f7d 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -3,7 +3,7 @@ git-merge(1) NAME ---- -git-merge - Grand Unified Merge Driver +git-merge - Join two or more development histories together SYNOPSIS diff --git a/git-mv.html b/git-mv.html index ab549e8d5..af010f6bf 100644 --- a/git-mv.html +++ b/git-mv.html @@ -266,7 +266,7 @@ git-mv(1) Manual Page

NAME

git-mv - - Move or rename a file, directory or symlink + Move or rename a file, a directory, or a symlink

@@ -337,7 +337,7 @@ Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de> diff --git a/git-mv.txt b/git-mv.txt index 207c43a63..6756b76bb 100644 --- a/git-mv.txt +++ b/git-mv.txt @@ -3,7 +3,7 @@ git-mv(1) NAME ---- -git-mv - Move or rename a file, directory or symlink +git-mv - Move or rename a file, a directory, or a symlink SYNOPSIS diff --git a/git-pack-redundant.html b/git-pack-redundant.html index 951c51df3..2c8047429 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html @@ -266,7 +266,7 @@ git-pack-redundant(1) Manual Page

NAME

git-pack-redundant - - Program used to find redundant pack files + Find redundant pack files

@@ -335,7 +335,7 @@ objects.

diff --git a/git-pack-redundant.txt b/git-pack-redundant.txt index 7d54b17e3..be2c64eb5 100644 --- a/git-pack-redundant.txt +++ b/git-pack-redundant.txt @@ -3,7 +3,7 @@ git-pack-redundant(1) NAME ---- -git-pack-redundant - Program used to find redundant pack files +git-pack-redundant - Find redundant pack files SYNOPSIS diff --git a/git-parse-remote.html b/git-parse-remote.html index 10789f5bd..c0034a81e 100644 --- a/git-parse-remote.html +++ b/git-parse-remote.html @@ -266,7 +266,7 @@ git-parse-remote(1) Manual Page

NAME

git-parse-remote - - Routines to help parsing $GIT_DIR/remotes/ + Routines to help parsing remote repository access parameters

@@ -326,7 +326,7 @@ get_remote_refs_for_push diff --git a/git-parse-remote.txt b/git-parse-remote.txt index 918ca55f5..11b1f4d2e 100644 --- a/git-parse-remote.txt +++ b/git-parse-remote.txt @@ -3,7 +3,7 @@ git-parse-remote(1) NAME ---- -git-parse-remote - Routines to help parsing $GIT_DIR/remotes/ +git-parse-remote - Routines to help parsing remote repository access parameters SYNOPSIS diff --git a/git-patch-id.html b/git-patch-id.html index c80073f80..fef7ccd2b 100644 --- a/git-patch-id.html +++ b/git-patch-id.html @@ -266,7 +266,7 @@ git-patch-id(1) Manual Page

NAME

git-patch-id - - Generate a patch ID + Compute unique ID for a patch

@@ -314,7 +314,7 @@ This can be used to make a mapping from patch ID to commit ID.

diff --git a/git-patch-id.txt b/git-patch-id.txt index 5389097f7..a7e9fd021 100644 --- a/git-patch-id.txt +++ b/git-patch-id.txt @@ -3,7 +3,7 @@ git-patch-id(1) NAME ---- -git-patch-id - Generate a patch ID +git-patch-id - Compute unique ID for a patch SYNOPSIS -------- diff --git a/git-peek-remote.html b/git-peek-remote.html index d9ce63d32..600fd5ac3 100644 --- a/git-peek-remote.html +++ b/git-peek-remote.html @@ -266,7 +266,7 @@ git-peek-remote(1) Manual Page

NAME

git-peek-remote - - Lists the references in a remote repository + List the references in a remote repository

@@ -333,7 +333,7 @@ stores them in the local repository under the same name.

diff --git a/git-peek-remote.txt b/git-peek-remote.txt index a00060c50..ac57cda3a 100644 --- a/git-peek-remote.txt +++ b/git-peek-remote.txt @@ -3,7 +3,7 @@ git-peek-remote(1) NAME ---- -git-peek-remote - Lists the references in a remote repository +git-peek-remote - List the references in a remote repository SYNOPSIS diff --git a/git-prune-packed.html b/git-prune-packed.html index dc3ebd039..554330321 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html @@ -266,7 +266,7 @@ git-prune-packed(1) Manual Page

NAME

git-prune-packed - - Program used to remove the extra object files that are now residing in a pack file. + Remove extra objects that are already in pack files

@@ -325,7 +325,7 @@ disk storage, etc.

diff --git a/git-prune-packed.txt b/git-prune-packed.txt index a79193fb0..310033e46 100644 --- a/git-prune-packed.txt +++ b/git-prune-packed.txt @@ -3,8 +3,7 @@ git-prune-packed(1) NAME ---- -git-prune-packed - Program used to remove the extra object files that are now -residing in a pack file. +git-prune-packed - Remove extra objects that are already in pack files SYNOPSIS diff --git a/git-pull.html b/git-pull.html index 0a593a8a4..230f8df2f 100644 --- a/git-pull.html +++ b/git-pull.html @@ -266,7 +266,7 @@ git-pull(1) Manual Page

NAME

git-pull - - Pull and merge from another repository or a local branch + Fetch from and merge with another repository or a local branch

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

diff --git a/git-pull.txt b/git-pull.txt index a90b764cc..3e5f11572 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -3,7 +3,7 @@ git-pull(1) NAME ---- -git-pull - Pull and merge from another repository or a local branch +git-pull - Fetch from and merge with another repository or a local branch SYNOPSIS diff --git a/git-rebase.html b/git-rebase.html index d10a5a0ad..46b55d3d0 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -266,7 +266,7 @@ git-rebase(1) Manual Page

NAME

git-rebase - - Rebase local commits to a new head + Forward-port local commits to the updated upstream head

@@ -559,7 +559,7 @@ a rebase. Upon completion, <branch> will be the current branch.

diff --git a/git-rebase.txt b/git-rebase.txt index 03e867a40..0cb9e1f10 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -3,7 +3,7 @@ git-rebase(1) NAME ---- -git-rebase - Rebase local commits to a new head +git-rebase - Forward-port local commits to the updated upstream head SYNOPSIS -------- diff --git a/git-receive-pack.html b/git-receive-pack.html index db2093766..6c73b5d94 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html @@ -266,7 +266,7 @@ git-receive-pack(1) Manual Page

NAME

git-receive-pack - - Receive what is pushed into it + Receive what is pushed into the repository

@@ -367,7 +367,7 @@ tells it if updates to a ref should be denied if they are not fast-forwards.

diff --git a/git-receive-pack.txt b/git-receive-pack.txt index 0dfadc2a3..10e8c46c4 100644 --- a/git-receive-pack.txt +++ b/git-receive-pack.txt @@ -3,7 +3,7 @@ git-receive-pack(1) NAME ---- -git-receive-pack - Receive what is pushed into it +git-receive-pack - Receive what is pushed into the repository SYNOPSIS diff --git a/git-repack.html b/git-repack.html index 6d4c22adb..7cabc44c2 100644 --- a/git-repack.html +++ b/git-repack.html @@ -266,7 +266,7 @@ git-repack(1) Manual Page

NAME

git-repack - - Script used to pack a repository from a collection of objects into pack files. + Pack unpacked objects in a repository

@@ -394,7 +394,7 @@ that way can try to use older git with it).

diff --git a/git-repack.txt b/git-repack.txt index 0fa47e3b0..4a57ce860 100644 --- a/git-repack.txt +++ b/git-repack.txt @@ -3,8 +3,7 @@ git-repack(1) NAME ---- -git-repack - Script used to pack a repository from a collection of -objects into pack files. +git-repack - Pack unpacked objects in a repository SYNOPSIS diff --git a/git-repo-config.html b/git-repo-config.html index fcb8283e7..0a979cf8d 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -266,7 +266,7 @@ git-repo-config(1) Manual Page

NAME

git-repo-config - - Get and set repository or global options. + Get and set repository or global options

@@ -1284,7 +1284,7 @@ receive.denyNonFastForwards diff --git a/git-repo-config.txt b/git-repo-config.txt index c55a8ba0d..9db3d3082 100644 --- a/git-repo-config.txt +++ b/git-repo-config.txt @@ -3,7 +3,7 @@ git-repo-config(1) NAME ---- -git-repo-config - Get and set repository or global options. +git-repo-config - Get and set repository or global options SYNOPSIS diff --git a/git-rerere.html b/git-rerere.html index 2cd980d93..2a2beef86 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -266,7 +266,7 @@ git-rerere(1) Manual Page

NAME

git-rerere - - Reuse recorded resolve + Reuse recorded resolution of conflicted merges

@@ -482,7 +482,7 @@ conflict.

diff --git a/git-rerere.txt b/git-rerere.txt index c65c59e86..139b6eb77 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -3,7 +3,7 @@ git-rerere(1) NAME ---- -git-rerere - Reuse recorded resolve +git-rerere - Reuse recorded resolution of conflicted merges SYNOPSIS -------- diff --git a/git-send-pack.html b/git-send-pack.html index dc9936b8d..3ef3baf20 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -266,7 +266,7 @@ git-send-pack(1) Manual Page

NAME

git-send-pack - - Push missing objects packed + Push objects over git protocol to another reposiotory

@@ -418,7 +418,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-send-pack.txt b/git-send-pack.txt index 88f4e394e..eea8fe8af 100644 --- a/git-send-pack.txt +++ b/git-send-pack.txt @@ -3,7 +3,7 @@ git-send-pack(1) NAME ---- -git-send-pack - Push missing objects packed +git-send-pack - Push objects over git protocol to another reposiotory SYNOPSIS diff --git a/git-shell.html b/git-shell.html index d15c8497e..37a39c3d4 100644 --- a/git-shell.html +++ b/git-shell.html @@ -266,7 +266,7 @@ git-shell(1) Manual Page

NAME

git-shell - - Restricted login shell for GIT over SSH only + Restricted login shell for GIT-only SSH access

@@ -298,7 +298,7 @@ are permitted to be called, with a single required argument.

diff --git a/git-shell.txt b/git-shell.txt index cc4266d83..228b9f14f 100644 --- a/git-shell.txt +++ b/git-shell.txt @@ -3,7 +3,7 @@ git-shell(1) NAME ---- -git-shell - Restricted login shell for GIT over SSH only +git-shell - Restricted login shell for GIT-only SSH access SYNOPSIS diff --git a/git-ssh-fetch.html b/git-ssh-fetch.html index bce84327b..2bc722791 100644 --- a/git-ssh-fetch.html +++ b/git-ssh-fetch.html @@ -266,7 +266,7 @@ git-ssh-fetch(1) Manual Page

NAME

git-ssh-fetch - - Pulls from a remote repository over ssh connection + Fetch from a remote repository over ssh connection

@@ -349,7 +349,7 @@ commit-id diff --git a/git-ssh-fetch.txt b/git-ssh-fetch.txt index b7116b30e..192b1f15a 100644 --- a/git-ssh-fetch.txt +++ b/git-ssh-fetch.txt @@ -3,7 +3,7 @@ git-ssh-fetch(1) NAME ---- -git-ssh-fetch - Pulls from a remote repository over ssh connection +git-ssh-fetch - Fetch from a remote repository over ssh connection diff --git a/git-ssh-upload.html b/git-ssh-upload.html index 12e6ca555..093653ca2 100644 --- a/git-ssh-upload.html +++ b/git-ssh-upload.html @@ -266,7 +266,7 @@ git-ssh-upload(1) Manual Page

NAME

git-ssh-upload - - Pushes to a remote repository over ssh connection + Push to a remote repository over ssh connection

@@ -348,7 +348,7 @@ commit-id diff --git a/git-ssh-upload.txt b/git-ssh-upload.txt index 702674e45..a9b7e9f97 100644 --- a/git-ssh-upload.txt +++ b/git-ssh-upload.txt @@ -3,7 +3,7 @@ git-ssh-upload(1) NAME ---- -git-ssh-upload - Pushes to a remote repository over ssh connection +git-ssh-upload - Push to a remote repository over ssh connection SYNOPSIS diff --git a/git-status.html b/git-status.html index ca19ac548..b0f685414 100644 --- a/git-status.html +++ b/git-status.html @@ -266,7 +266,7 @@ git-status(1) Manual Page

NAME

git-status - - Show working tree status + Show the working tree status

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

diff --git a/git-status.txt b/git-status.txt index 7f86d8cd5..03871e5d7 100644 --- a/git-status.txt +++ b/git-status.txt @@ -3,7 +3,7 @@ git-status(1) NAME ---- -git-status - Show working tree status +git-status - Show the working tree status SYNOPSIS diff --git a/git-svn.html b/git-svn.html index c7d6439af..e2909219e 100644 --- a/git-svn.html +++ b/git-svn.html @@ -266,7 +266,7 @@ git-svn(1) Manual Page

NAME

git-svn - - bidirectional operation between Subversion and git + Bidirectional operation between a single Subversion branch and git

@@ -911,7 +911,7 @@ detect them.

diff --git a/git-svn.txt b/git-svn.txt index 321083d46..b95ff1da9 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -3,7 +3,7 @@ git-svn(1) NAME ---- -git-svn - bidirectional operation between Subversion and git +git-svn - Bidirectional operation between a single Subversion branch and git SYNOPSIS -------- diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index 6d871a500..e21a3c8e8 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -266,7 +266,7 @@ git-symbolic-ref(1) Manual Page

NAME

git-symbolic-ref - - read and modify symbolic refs + Read and modify symbolic refs

@@ -327,7 +327,7 @@ name is not a symbolic ref, or 128 if another error occurs.

diff --git a/git-symbolic-ref.txt b/git-symbolic-ref.txt index fec3b4f64..f93b79a85 100644 --- a/git-symbolic-ref.txt +++ b/git-symbolic-ref.txt @@ -3,7 +3,7 @@ git-symbolic-ref(1) NAME ---- -git-symbolic-ref - read and modify symbolic refs +git-symbolic-ref - Read and modify symbolic refs SYNOPSIS -------- diff --git a/git-tar-tree.html b/git-tar-tree.html index 3b07129cb..db0f2ac60 100644 --- a/git-tar-tree.html +++ b/git-tar-tree.html @@ -266,7 +266,7 @@ git-tar-tree(1) Manual Page

NAME

git-tar-tree - - Creates a tar archive of the files in the named tree + Create a tar archive of the files in the named tree object

@@ -395,7 +395,7 @@ git tar-tree HEAD:Documentation/ git-docs > git-1.4.0-docs.tar diff --git a/git-tar-tree.txt b/git-tar-tree.txt index bc3360f07..595940524 100644 --- a/git-tar-tree.txt +++ b/git-tar-tree.txt @@ -3,7 +3,7 @@ git-tar-tree(1) NAME ---- -git-tar-tree - Creates a tar archive of the files in the named tree +git-tar-tree - Create a tar archive of the files in the named tree object SYNOPSIS diff --git a/git-update-index.html b/git-update-index.html index 4eb30a42f..a4db23a8f 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -266,7 +266,7 @@ git-update-index(1) Manual Page

NAME

git-update-index - - Modifies the index or directory cache + Register file contents in the working tree to the index

@@ -714,7 +714,7 @@ need to use git-update-index --chmod=.

diff --git a/git-update-index.txt b/git-update-index.txt index 0e0a3af1b..5bbae42d8 100644 --- a/git-update-index.txt +++ b/git-update-index.txt @@ -3,7 +3,7 @@ git-update-index(1) NAME ---- -git-update-index - Modifies the index or directory cache +git-update-index - Register file contents in the working tree to the index SYNOPSIS diff --git a/git-update-ref.html b/git-update-ref.html index d2f076494..edb712506 100644 --- a/git-update-ref.html +++ b/git-update-ref.html @@ -266,7 +266,7 @@ git-update-ref(1) Manual Page

NAME

git-update-ref - - update the object name stored in a ref safely + Update the object name stored in a ref safely

@@ -358,7 +358,7 @@ or does not have committer information available.

diff --git a/git-update-ref.txt b/git-update-ref.txt index 71bcb7954..9424feab3 100644 --- a/git-update-ref.txt +++ b/git-update-ref.txt @@ -3,7 +3,7 @@ git-update-ref(1) NAME ---- -git-update-ref - update the object name stored in a ref safely +git-update-ref - Update the object name stored in a ref safely SYNOPSIS -------- diff --git a/git-upload-archive.html b/git-upload-archive.html index c9ce0871b..f803b818e 100644 --- a/git-upload-archive.html +++ b/git-upload-archive.html @@ -266,7 +266,7 @@ git-upload-archive(1) Manual Page

NAME

git-upload-archive - - Send archive + Send archive back to git-archive

@@ -309,7 +309,7 @@ is meant to be used to get an archive from a remote repository.

diff --git a/git-upload-archive.txt b/git-upload-archive.txt index 388bb53d2..403871d7c 100644 --- a/git-upload-archive.txt +++ b/git-upload-archive.txt @@ -3,7 +3,7 @@ git-upload-archive(1) NAME ---- -git-upload-archive - Send archive +git-upload-archive - Send archive back to git-archive SYNOPSIS diff --git a/git-upload-pack.html b/git-upload-pack.html index 43def6041..f47762610 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html @@ -266,7 +266,7 @@ git-upload-pack(1) Manual Page

NAME

git-upload-pack - - Send missing objects packed + Send objects packed back to git-fetch-pack

@@ -310,7 +310,7 @@ repository. For push operations, see git-send-pack.

diff --git a/git-upload-pack.txt b/git-upload-pack.txt index b2c930766..9da062d5c 100644 --- a/git-upload-pack.txt +++ b/git-upload-pack.txt @@ -3,7 +3,7 @@ git-upload-pack(1) NAME ---- -git-upload-pack - Send missing objects packed +git-upload-pack - Send objects packed back to git-fetch-pack SYNOPSIS diff --git a/git-var.html b/git-var.html index 895b6cecd..e5354ef41 100644 --- a/git-var.html +++ b/git-var.html @@ -266,7 +266,7 @@ git-var(1) Manual Page

NAME

git-var - - Print the git users identity + Show a git logical variable

@@ -372,7 +372,7 @@ Your sysadmin must hate you! diff --git a/git-var.txt b/git-var.txt index a5b1a0dba..8a50638e9 100644 --- a/git-var.txt +++ b/git-var.txt @@ -3,7 +3,7 @@ git-var(1) NAME ---- -git-var - Print the git users identity +git-var - Show a git logical variable SYNOPSIS diff --git a/git-write-tree.html b/git-write-tree.html index b09ce6420..8e97c46c5 100644 --- a/git-write-tree.html +++ b/git-write-tree.html @@ -266,7 +266,7 @@ git-write-tree(1) Manual Page

NAME

git-write-tree - - Creates a tree object from the current index + Create a tree object from the current index

@@ -323,7 +323,7 @@ now, you need to have done a git-update-index phase before you did the diff --git a/git-write-tree.txt b/git-write-tree.txt index c85fa89c3..96d5e07b1 100644 --- a/git-write-tree.txt +++ b/git-write-tree.txt @@ -3,7 +3,7 @@ git-write-tree(1) NAME ---- -git-write-tree - Creates a tree object from the current index +git-write-tree - Create a tree object from the current index SYNOPSIS diff --git a/git.html b/git.html index d7710c40a..c9e29c37e 100644 --- a/git.html +++ b/git.html @@ -374,7 +374,7 @@ ancillary user utilities.

- Add paths to the index. + Add file contents to the changeset to be committed next.

@@ -382,7 +382,7 @@ ancillary user utilities.

- Apply patches from a mailbox, but cooler. + Apply a series of patches from a mailbox.

@@ -390,7 +390,7 @@ ancillary user utilities.

- Apply patches from a mailbox, original version by Linus. + Apply a series of patches in a mailbox.

@@ -414,7 +414,7 @@ ancillary user utilities.

- Create and Show branches. + List, create, or delete branches.

@@ -430,7 +430,7 @@ ancillary user utilities.

- Cherry-pick the effect of an existing commit. + Apply the change introduced by an existing commit.

@@ -470,7 +470,7 @@ ancillary user utilities.

- Download from a remote repository via various protocols. + Download objects and refs from another repository.

@@ -502,7 +502,7 @@ ancillary user utilities.

- Shows commit logs. + Show commit logs.

@@ -510,7 +510,7 @@ ancillary user utilities.

- Shows references in a remote or local repository. + List references in a remote repository.

@@ -518,7 +518,7 @@ ancillary user utilities.

- Grand unified merge driver. + Join two or more development histories together.

@@ -542,7 +542,7 @@ ancillary user utilities.

- Fetch from and merge with a remote repository or a local branch. + Fetch from and merge with another repository or a local branch.

@@ -558,7 +558,7 @@ ancillary user utilities.

- Rebase local commits to the updated upstream head. + Forward-port local commits to the updated upstream head.

@@ -614,7 +614,7 @@ ancillary user utilities.

- Summarizes git log output. + Summarize git log output.

@@ -622,7 +622,7 @@ ancillary user utilities.

- Show one commit log and its diff. + Show various types of objects.

@@ -638,7 +638,7 @@ ancillary user utilities.

- Shows the working tree status. + Show the working tree status.

@@ -654,7 +654,7 @@ ancillary user utilities.

- Shows commit logs and differences they introduce. + Show logs with difference each commit introduces.

@@ -674,7 +674,7 @@ ancillary user utilities.

- Import an arch repository into git. + Import an Arch repository into git.

@@ -686,19 +686,19 @@ ancillary user utilities.

-git-cvsimport(1) +git-cvsexportcommit(1)

- Salvage your data out of another SCM people love to hate. + Export a single commit to a CVS checkout.

-git-cvsexportcommit(1) +git-cvsimport(1)

- Export a single commit to a CVS checkout. + Salvage your data out of another SCM people love to hate.

@@ -730,7 +730,7 @@ ancillary user utilities.

- The standard helper program to use with git-merge-index. + The standard helper program to use with git-merge-index.

@@ -766,27 +766,27 @@ ancillary user utilities.

-git-svn(1) +git-sh-setup(1)

- Bidirectional operation between a single Subversion branch and git. + Common git shell script setup code.

-git-svnimport(1) +git-svn(1)

- Import a SVN repository into git. + Bidirectional operation between a single Subversion branch and git.

-git-sh-setup(1) +git-svnimport(1)

- Common git shell script setup code. + Import a SVN repository into git.

@@ -829,7 +829,7 @@ ancillary user utilities.

- Find out where each line in a file came from. + Show what revision and author last modified each line of a file.

@@ -901,9 +901,7 @@ ancillary user utilities.

- Extracts patch and authorship information from a single - e-mail message, optionally transliterating the commit - message into utf-8. + Extracts patch and authorship from a single e-mail message.

@@ -911,8 +909,7 @@ ancillary user utilities.

- A stupid program to split UNIX mbox format mailbox into - individual pieces of e-mail. + Simple UNIX mbox splitter program.

@@ -924,19 +921,19 @@ ancillary user utilities.

-git-patch-id(1) +git-parse-remote(1)

- Compute unique ID for a patch. + Routines to help parsing remote repository access parameters.

-git-parse-remote(1) +git-patch-id(1)

- Routines to help parsing $GIT_DIR/remotes/ files. + Compute unique ID for a patch.

@@ -944,7 +941,7 @@ ancillary user utilities.

- git-request-pull. + Generates a summary of pending changes.

@@ -968,23 +965,23 @@ ancillary user utilities.

- Send patch e-mails out of "format-patch --mbox" output. + Send a collection of patches as emails.

-git-symbolic-ref(1) +git-stripspace(1)

- Read and modify symbolic refs. + Filter out empty lines.

-git-stripspace(1) +git-symbolic-ref(1)

- Filter out empty lines. + Read and modify symbolic refs.

@@ -1007,8 +1004,7 @@ repositories.

- Reads a "diff -up1" or git generated patch file and - applies it to the working tree. + Apply a patch on a git index file and a working tree.

@@ -1024,7 +1020,7 @@ repositories.

- Creates a new commit object. + Create a new commit object.

@@ -1032,7 +1028,7 @@ repositories.

- Computes the object ID from a file. + Compute object ID and optionally creates a blob from a file.

@@ -1040,7 +1036,7 @@ repositories.

- Build pack idx file for an existing packed archive. + Build pack index file for an existing packed archive.

@@ -1048,8 +1044,7 @@ repositories.

- Creates an empty git repository, or reinitialize an - existing one. + Create an empty git repository or reinitialize an existing one.

@@ -1057,7 +1052,7 @@ repositories.

- Runs a threeway merge. + Run a three-way file merge.

@@ -1065,7 +1060,7 @@ repositories.

- Runs a merge for files needing merging. + Run a merge for files needing merging.

@@ -1089,7 +1084,7 @@ repositories.

- Creates a packed archive of objects. + Create a packed archive of objects.

@@ -1113,7 +1108,7 @@ repositories.

- Get and set options in .git/config. + Get and set repository or global options.

@@ -1121,7 +1116,7 @@ repositories.

- Unpacks objects out of a packed archive. + Unpack objects from a packed archive.

@@ -1129,7 +1124,7 @@ repositories.

- Registers files in the working tree to the index. + Register file contents in the working tree to the index.

@@ -1137,7 +1132,7 @@ repositories.

- Creates a tree from the index. + Create a tree object from the current index.

@@ -1160,19 +1155,19 @@ repositories.

-git-diff-index(1) +git-diff-files(1)

- Compares content and mode of blobs between the index and repository. + Compares files in the working tree and the index.

-git-diff-files(1) +git-diff-index(1)

- Compares files in the working tree and the index. + Compares content and mode of blobs between the index and repository.

@@ -1180,7 +1175,7 @@ repositories.

- Compares two "merge stages" in the index. + Compares two merge stages in the index.

@@ -1212,7 +1207,7 @@ repositories.

- Information about files in the index and the working tree. + Show information about files in the index and the working tree.

@@ -1220,7 +1215,7 @@ repositories.

- Displays a tree object in human readable form. + List the contents of a tree object.

@@ -1228,7 +1223,7 @@ repositories.

- Finds as good common ancestors as possible for a merge. + Find as good common ancestors as possible for a merge.

@@ -1260,7 +1255,7 @@ repositories.

- Displays contents of a pack idx file. + Show packed archive index.

@@ -1276,7 +1271,7 @@ repositories.

- Creates a tar archive of the files in the named tree object. + Create a tar archive of the files in the named tree object.

@@ -1292,7 +1287,7 @@ repositories.

- Displays a git logical variable. + Show a git logical variable.

@@ -1300,7 +1295,7 @@ repositories.

- Validates packed git archive files. + Validate packed git archive files.

@@ -1313,8 +1308,7 @@ the working tree.

- Updates from a remote repository (engine for ssh and - local transport). + Receive missing objects from another repository.

@@ -1322,51 +1316,47 @@ the working tree.

- Downloads a remote git repository via HTTP by walking - commit chain. + Download from a remote git repository via HTTP.

-git-local-fetch(1) +git-http-push(1)

- Duplicates another git repository on a local system by - walking commit chain. + Push objects over HTTP/DAV to another repository.

-git-peek-remote(1) +git-local-fetch(1)

- Lists references on a remote repository using - upload-pack protocol (engine for ssh and local - transport). + Duplicate another git repository on a local system.

-git-receive-pack(1) +git-peek-remote(1)

- Invoked by git-send-pack to receive what is pushed to it. + List the references in a remote repository.

-git-send-pack(1) +git-receive-pack(1)

- Pushes to a remote repository, intelligently. + Receive what is pushed into the repository.

-git-http-push(1) +git-send-pack(1)

- Push missing objects using HTTP/DAV. + Push objects over git protocol to another reposiotory.

@@ -1374,7 +1364,7 @@ the working tree.

- Restricted shell for GIT-only SSH access. + Restricted login shell for GIT-only SSH access.

@@ -1382,8 +1372,7 @@ the working tree.

- Pulls from a remote repository over ssh connection by - walking commit chain. + Fetch from a remote repository over ssh connection.

@@ -1391,7 +1380,7 @@ the working tree.

- Helper "server-side" program used by git-ssh-fetch. + Push to a remote repository over ssh connection.

@@ -1399,8 +1388,7 @@ the working tree.

- Updates auxiliary information on a dumb server to help - clients discover references and packs on it. + Update auxiliary info file to help dumb servers.

@@ -1408,7 +1396,7 @@ the working tree.

- Invoked by git-archive to send a generated archive. + Send archive back to git-archive.

@@ -1416,8 +1404,7 @@ the working tree.

- Invoked by git-fetch-pack to push - what are asked for. + Send objects packed back to git-fetch-pack.

@@ -2285,7 +2272,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index a0bcef71d..ac222060e 100644 --- a/git.txt +++ b/git.txt @@ -81,245 +81,17 @@ ancillary user utilities. Main porcelain commands ~~~~~~~~~~~~~~~~~~~~~~~ -gitlink:git-add[1]:: - Add paths to the index. - -gitlink:git-am[1]:: - Apply patches from a mailbox, but cooler. - -gitlink:git-applymbox[1]:: - Apply patches from a mailbox, original version by Linus. - -gitlink:git-archive[1]:: - Creates an archive of files from a named tree. - -gitlink:git-bisect[1]:: - Find the change that introduced a bug by binary search. - -gitlink:git-branch[1]:: - Create and Show branches. - -gitlink:git-checkout[1]:: - Checkout and switch to a branch. - -gitlink:git-cherry-pick[1]:: - Cherry-pick the effect of an existing commit. - -gitlink:git-clean[1]:: - Remove untracked files from the working tree. - -gitlink:git-clone[1]:: - Clones a repository into a new directory. - -gitlink:git-commit[1]:: - Record changes to the repository. - -gitlink:git-diff[1]:: - Show changes between commits, commit and working tree, etc. - -gitlink:git-fetch[1]:: - Download from a remote repository via various protocols. - -gitlink:git-format-patch[1]:: - Prepare patches for e-mail submission. - -gitlink:git-grep[1]:: - Print lines matching a pattern. - -gitlink:gitk[1]:: - The git repository browser. - -gitlink:git-log[1]:: - Shows commit logs. - -gitlink:git-ls-remote[1]:: - Shows references in a remote or local repository. - -gitlink:git-merge[1]:: - Grand unified merge driver. - -gitlink:git-mv[1]:: - Move or rename a file, a directory, or a symlink. - -gitlink:git-pack-refs[1]:: - Pack heads and tags for efficient repository access. - -gitlink:git-pull[1]:: - Fetch from and merge with a remote repository or a local branch. - -gitlink:git-push[1]:: - Update remote refs along with associated objects. - -gitlink:git-rebase[1]:: - Rebase local commits to the updated upstream head. - -gitlink:git-repack[1]:: - Pack unpacked objects in a repository. - -gitlink:git-rerere[1]:: - Reuse recorded resolution of conflicted merges. - -gitlink:git-reset[1]:: - Reset current HEAD to the specified state. - -gitlink:git-resolve[1]:: - Merge two commits. - -gitlink:git-revert[1]:: - Revert an existing commit. - -gitlink:git-rm[1]:: - Remove files from the working tree and from the index. - -gitlink:git-shortlog[1]:: - Summarizes 'git log' output. - -gitlink:git-show[1]:: - Show one commit log and its diff. - -gitlink:git-show-branch[1]:: - Show branches and their commits. - -gitlink:git-status[1]:: - Shows the working tree status. - -gitlink:git-verify-tag[1]:: - Check the GPG signature of tag. - -gitlink:git-whatchanged[1]:: - Shows commit logs and differences they introduce. - +include::cmds-mainporcelain.txt[] Ancillary Commands ~~~~~~~~~~~~~~~~~~ Manipulators: -gitlink:git-applypatch[1]:: - Apply one patch extracted from an e-mail. - -gitlink:git-archimport[1]:: - Import an arch repository into git. - -gitlink:git-convert-objects[1]:: - Converts old-style git repository. - -gitlink:git-cvsimport[1]:: - Salvage your data out of another SCM people love to hate. - -gitlink:git-cvsexportcommit[1]:: - Export a single commit to a CVS checkout. - -gitlink:git-cvsserver[1]:: - A CVS server emulator for git. - -gitlink:git-gc[1]:: - Cleanup unnecessary files and optimize the local repository. - -gitlink:git-lost-found[1]:: - Recover lost refs that luckily have not yet been pruned. - -gitlink:git-merge-one-file[1]:: - The standard helper program to use with `git-merge-index`. - -gitlink:git-prune[1]:: - Prunes all unreachable objects from the object database. - -gitlink:git-quiltimport[1]:: - Applies a quilt patchset onto the current branch. - -gitlink:git-reflog[1]:: - Manage reflog information. - -gitlink:git-relink[1]:: - Hardlink common objects in local repositories. - -gitlink:git-svn[1]:: - Bidirectional operation between a single Subversion branch and git. - -gitlink:git-svnimport[1]:: - Import a SVN repository into git. - -gitlink:git-sh-setup[1]:: - Common git shell script setup code. - -gitlink:git-symbolic-ref[1]:: - Read and modify symbolic refs. - -gitlink:git-tag[1]:: - Create or verify a tag object signed with GPG. - -gitlink:git-update-ref[1]:: - Update the object name stored in a ref safely. - +include::cmds-ancillarymanipulators.txt[] Interrogators: -gitlink:git-annotate[1]:: - Annotate file lines with commit info. - -gitlink:git-blame[1]:: - Find out where each line in a file came from. - -gitlink:git-check-ref-format[1]:: - Make sure ref name is well formed. - -gitlink:git-cherry[1]:: - Find commits not merged upstream. - -gitlink:git-count-objects[1]:: - Count unpacked number of objects and their disk consumption. - -gitlink:git-daemon[1]:: - A really simple server for git repositories. - -gitlink:git-fmt-merge-msg[1]:: - Produce a merge commit message. - -gitlink:git-get-tar-commit-id[1]:: - Extract commit ID from an archive created using git-tar-tree. - -gitlink:git-imap-send[1]:: - Dump a mailbox from stdin into an imap folder. - -gitlink:git-instaweb[1]:: - Instantly browse your working repository in gitweb. - -gitlink:git-mailinfo[1]:: - Extracts patch and authorship information from a single - e-mail message, optionally transliterating the commit - message into utf-8. - -gitlink:git-mailsplit[1]:: - A stupid program to split UNIX mbox format mailbox into - individual pieces of e-mail. - -gitlink:git-merge-tree[1]:: - Show three-way merge without touching index. - -gitlink:git-patch-id[1]:: - Compute unique ID for a patch. - -gitlink:git-parse-remote[1]:: - Routines to help parsing `$GIT_DIR/remotes/` files. - -gitlink:git-request-pull[1]:: - git-request-pull. - -gitlink:git-rev-parse[1]:: - Pick out and massage parameters. - -gitlink:git-runstatus[1]:: - A helper for git-status and git-commit. - -gitlink:git-send-email[1]:: - Send patch e-mails out of "format-patch --mbox" output. - -gitlink:git-symbolic-ref[1]:: - Read and modify symbolic refs. - -gitlink:git-stripspace[1]:: - Filter out empty lines. - +include::cmds-ancillaryinterrogators.txt[] Low-level commands (plumbing) ----------------------------- @@ -337,122 +109,14 @@ repositories. Manipulation commands ~~~~~~~~~~~~~~~~~~~~~ -gitlink:git-apply[1]:: - Reads a "diff -up1" or git generated patch file and - applies it to the working tree. - -gitlink:git-checkout-index[1]:: - Copy files from the index to the working tree. -gitlink:git-commit-tree[1]:: - Creates a new commit object. - -gitlink:git-hash-object[1]:: - Computes the object ID from a file. - -gitlink:git-index-pack[1]:: - Build pack idx file for an existing packed archive. - -gitlink:git-init[1]:: - Creates an empty git repository, or reinitialize an - existing one. - -gitlink:git-merge-file[1]:: - Runs a threeway merge. - -gitlink:git-merge-index[1]:: - Runs a merge for files needing merging. - -gitlink:git-mktag[1]:: - Creates a tag object. - -gitlink:git-mktree[1]:: - Build a tree-object from ls-tree formatted text. - -gitlink:git-pack-objects[1]:: - Creates a packed archive of objects. - -gitlink:git-prune-packed[1]:: - Remove extra objects that are already in pack files. - -gitlink:git-read-tree[1]:: - Reads tree information into the index. - -gitlink:git-repo-config[1]:: - Get and set options in .git/config. - -gitlink:git-unpack-objects[1]:: - Unpacks objects out of a packed archive. - -gitlink:git-update-index[1]:: - Registers files in the working tree to the index. - -gitlink:git-write-tree[1]:: - Creates a tree from the index. +include::cmds-plumbingmanipulators.txt[] Interrogation commands ~~~~~~~~~~~~~~~~~~~~~~ -gitlink:git-cat-file[1]:: - Provide content or type/size information for repository objects. - -gitlink:git-describe[1]:: - Show the most recent tag that is reachable from a commit. - -gitlink:git-diff-index[1]:: - Compares content and mode of blobs between the index and repository. - -gitlink:git-diff-files[1]:: - Compares files in the working tree and the index. - -gitlink:git-diff-stages[1]:: - Compares two "merge stages" in the index. - -gitlink:git-diff-tree[1]:: - Compares the content and mode of blobs found via two tree objects. - -gitlink:git-for-each-ref[1]:: - Output information on each ref. - -gitlink:git-fsck-objects[1]:: - Verifies the connectivity and validity of the objects in the database. - -gitlink:git-ls-files[1]:: - Information about files in the index and the working tree. - -gitlink:git-ls-tree[1]:: - Displays a tree object in human readable form. - -gitlink:git-merge-base[1]:: - Finds as good common ancestors as possible for a merge. - -gitlink:git-name-rev[1]:: - Find symbolic names for given revs. - -gitlink:git-pack-redundant[1]:: - Find redundant pack files. - -gitlink:git-rev-list[1]:: - Lists commit objects in reverse chronological order. - -gitlink:git-show-index[1]:: - Displays contents of a pack idx file. - -gitlink:git-show-ref[1]:: - List references in a local repository. - -gitlink:git-tar-tree[1]:: - Creates a tar archive of the files in the named tree object. - -gitlink:git-unpack-file[1]:: - Creates a temporary file with a blob's contents. - -gitlink:git-var[1]:: - Displays a git logical variable. - -gitlink:git-verify-pack[1]:: - Validates packed git archive files. +include::cmds-plumbinginterrogators.txt[] In general, the interrogate commands do not touch the files in the working tree. @@ -461,52 +125,7 @@ the working tree. Synching repositories ~~~~~~~~~~~~~~~~~~~~~ -gitlink:git-fetch-pack[1]:: - Updates from a remote repository (engine for ssh and - local transport). - -gitlink:git-http-fetch[1]:: - Downloads a remote git repository via HTTP by walking - commit chain. - -gitlink:git-local-fetch[1]:: - Duplicates another git repository on a local system by - walking commit chain. - -gitlink:git-peek-remote[1]:: - Lists references on a remote repository using - upload-pack protocol (engine for ssh and local - transport). - -gitlink:git-receive-pack[1]:: - Invoked by 'git-send-pack' to receive what is pushed to it. - -gitlink:git-send-pack[1]:: - Pushes to a remote repository, intelligently. - -gitlink:git-http-push[1]:: - Push missing objects using HTTP/DAV. - -gitlink:git-shell[1]:: - Restricted shell for GIT-only SSH access. - -gitlink:git-ssh-fetch[1]:: - Pulls from a remote repository over ssh connection by - walking commit chain. - -gitlink:git-ssh-upload[1]:: - Helper "server-side" program used by git-ssh-fetch. - -gitlink:git-update-server-info[1]:: - Updates auxiliary information on a dumb server to help - clients discover references and packs on it. - -gitlink:git-upload-archive[1]:: - Invoked by 'git-archive' to send a generated archive. - -gitlink:git-upload-pack[1]:: - Invoked by 'git-fetch-pack' to push - what are asked for. +include::cmds-synchingrepositories.txt[] Configuration Mechanism diff --git a/gitk.html b/gitk.html index afa99c48f..ca2d45d07 100644 --- a/gitk.html +++ b/gitk.html @@ -266,7 +266,7 @@ gitk(1) Manual Page

NAME

gitk - - git repository browser + The git repository browser

@@ -425,7 +425,7 @@ gitk --max-count=100 --all — Makefile diff --git a/gitk.txt b/gitk.txt index 6e2a8782c..5bdaa601f 100644 --- a/gitk.txt +++ b/gitk.txt @@ -3,7 +3,7 @@ gitk(1) NAME ---- -gitk - git repository browser +gitk - The git repository browser SYNOPSIS -------- diff --git a/howto-index.html b/howto-index.html index 31eb72534..9310f262f 100644 --- a/howto-index.html +++ b/howto-index.html @@ -365,7 +365,7 @@ as a Linux subsystem maintainer.

diff --git a/howto/rebase-from-internal-branch.txt b/howto/rebase-from-internal-branch.txt index fcd64e9b9..3b3a5c2e6 100644 --- a/howto/rebase-from-internal-branch.txt +++ b/howto/rebase-from-internal-branch.txt @@ -106,7 +106,7 @@ prepare #2 and #3 for e-mail submission. $ git format-patch master^^ master -This creates two files, 0001-XXXX.txt and 0002-XXXX.txt. Send +This creates two files, 0001-XXXX.patch and 0002-XXXX.patch. Send them out "To: " your project maintainer and "Cc: " your mailing list. You could use contributed script git-send-email if your host has necessary perl modules for this, but your usual