From c3f0baacadbd7b5710052213a2ec3cdd5b77bb6e Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Thu, 18 Jan 2007 15:53:37 -0800
Subject: [PATCH] Documentation: sync git.txt command list and manual page
 title

Also reorders a handful entries to make each list sorted
alphabetically.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 Documentation/cmds-ancillaryinterrogators.txt | 24 ++++++------
 Documentation/cmds-ancillarymanipulators.txt  | 16 ++++----
 Documentation/cmds-mainporcelain.txt          | 31 ++++++++-------
 Documentation/cmds-plumbinginterrogators.txt  | 22 +++++------
 Documentation/cmds-plumbingmanipulators.txt   | 27 +++++++------
 Documentation/cmds-synchingrepositories.txt   | 39 ++++++++-----------
 Documentation/git-am.txt                      |  2 +-
 Documentation/git-apply.txt                   |  2 +-
 Documentation/git-archive.txt                 |  2 +-
 Documentation/git-bisect.txt                  |  2 +-
 Documentation/git-branch.txt                  |  2 +-
 Documentation/git-cat-file.txt                |  2 +-
 Documentation/git-checkout-index.txt          |  2 +-
 Documentation/git-clone.txt                   |  2 +-
 Documentation/git-commit-tree.txt             |  2 +-
 Documentation/git-commit.txt                  |  2 +-
 Documentation/git-count-objects.txt           |  2 +-
 Documentation/git-cvsexportcommit.txt         |  2 +-
 Documentation/git-cvsimport.txt               |  2 +-
 Documentation/git-diff-stages.txt             |  2 +-
 Documentation/git-fetch.txt                   |  2 +-
 Documentation/git-hash-object.txt             |  2 +-
 Documentation/git-http-fetch.txt              |  2 +-
 Documentation/git-http-push.txt               |  2 +-
 Documentation/git-init.txt                    |  2 +-
 Documentation/git-instaweb.txt                |  2 +-
 Documentation/git-local-fetch.txt             |  2 +-
 Documentation/git-ls-files.txt                |  2 +-
 Documentation/git-ls-tree.txt                 |  2 +-
 Documentation/git-mailinfo.txt                |  2 +-
 Documentation/git-mailsplit.txt               |  2 +-
 Documentation/git-merge-base.txt              |  2 +-
 Documentation/git-merge-file.txt              |  2 +-
 Documentation/git-merge-index.txt             |  2 +-
 Documentation/git-merge-one-file.txt          |  2 +-
 Documentation/git-merge.txt                   |  2 +-
 Documentation/git-mv.txt                      |  2 +-
 Documentation/git-pack-redundant.txt          |  2 +-
 Documentation/git-parse-remote.txt            |  2 +-
 Documentation/git-patch-id.txt                |  2 +-
 Documentation/git-peek-remote.txt             |  2 +-
 Documentation/git-prune-packed.txt            |  3 +-
 Documentation/git-pull.txt                    |  2 +-
 Documentation/git-rebase.txt                  |  2 +-
 Documentation/git-receive-pack.txt            |  2 +-
 Documentation/git-repack.txt                  |  3 +-
 Documentation/git-repo-config.txt             |  2 +-
 Documentation/git-rerere.txt                  |  2 +-
 Documentation/git-send-pack.txt               |  2 +-
 Documentation/git-shell.txt                   |  2 +-
 Documentation/git-ssh-fetch.txt               |  2 +-
 Documentation/git-ssh-upload.txt              |  2 +-
 Documentation/git-status.txt                  |  2 +-
 Documentation/git-svn.txt                     |  2 +-
 Documentation/git-symbolic-ref.txt            |  2 +-
 Documentation/git-tar-tree.txt                |  2 +-
 Documentation/git-update-index.txt            |  2 +-
 Documentation/git-update-ref.txt              |  2 +-
 Documentation/git-upload-archive.txt          |  2 +-
 Documentation/git-upload-pack.txt             |  2 +-
 Documentation/git-var.txt                     |  2 +-
 Documentation/git-write-tree.txt              |  2 +-
 Documentation/gitk.txt                        |  2 +-
 63 files changed, 132 insertions(+), 143 deletions(-)

diff --git a/Documentation/cmds-ancillaryinterrogators.txt b/Documentation/cmds-ancillaryinterrogators.txt
index 83b36cea13..7398348d13 100644
--- a/Documentation/cmds-ancillaryinterrogators.txt
+++ b/Documentation/cmds-ancillaryinterrogators.txt
@@ -2,7 +2,7 @@ gitlink:git-annotate[1]::
 	Annotate file lines with commit info.
 
 gitlink:git-blame[1]::
-	Find out where each line in a file came from.
+	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.
@@ -29,25 +29,22 @@ 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.
+	Extracts patch and authorship from a single e-mail message.
 
 gitlink:git-mailsplit[1]::
-	A stupid program to split UNIX mbox format mailbox into
-	individual pieces of e-mail.
+	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-parse-remote[1]::
-	Routines to help parsing `$GIT_DIR/remotes/` files.
-
 gitlink:git-request-pull[1]::
-	git-request-pull.
+	Generates a summary of pending changes.
 
 gitlink:git-rev-parse[1]::
 	Pick out and massage parameters.
@@ -56,10 +53,11 @@ 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.
+	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.
 
-gitlink:git-stripspace[1]::
-	Filter out empty lines.
diff --git a/Documentation/cmds-ancillarymanipulators.txt b/Documentation/cmds-ancillarymanipulators.txt
index c3b4a5ee41..638a132aed 100644
--- a/Documentation/cmds-ancillarymanipulators.txt
+++ b/Documentation/cmds-ancillarymanipulators.txt
@@ -2,17 +2,17 @@ gitlink:git-applypatch[1]::
 	Apply one patch extracted from an e-mail.
 
 gitlink:git-archimport[1]::
-	Import an arch repository into git.
+	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-cvsimport[1]::
+	Salvage your data out of another SCM people love to hate.
+
 gitlink:git-cvsserver[1]::
 	A CVS server emulator for git.
 
@@ -23,7 +23,7 @@ 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`.
+	The standard helper program to use with git-merge-index.
 
 gitlink:git-prune[1]::
 	Prunes all unreachable objects from the object database.
@@ -37,15 +37,15 @@ gitlink:git-reflog[1]::
 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-sh-setup[1]::
-	Common git shell script setup code.
-
 gitlink:git-symbolic-ref[1]::
 	Read and modify symbolic refs.
 
diff --git a/Documentation/cmds-mainporcelain.txt b/Documentation/cmds-mainporcelain.txt
index 0bdfc439f1..05c5965dcc 100644
--- a/Documentation/cmds-mainporcelain.txt
+++ b/Documentation/cmds-mainporcelain.txt
@@ -1,11 +1,11 @@
 gitlink:git-add[1]::
-	Add paths to the index.
+	Add file contents to the changeset to be committed next.
 
 gitlink:git-am[1]::
-	Apply patches from a mailbox, but cooler.
+	Apply a series of patches from a mailbox.
 
 gitlink:git-applymbox[1]::
-	Apply patches from a mailbox, original version by Linus.
+	Apply a series of patches in a mailbox.
 
 gitlink:git-archive[1]::
 	Creates an archive of files from a named tree.
@@ -14,13 +14,13 @@ gitlink:git-bisect[1]::
 	Find the change that introduced a bug by binary search.
 
 gitlink:git-branch[1]::
-	Create and Show branches.
+	List, create, or delete branches.
 
 gitlink:git-checkout[1]::
 	Checkout and switch to a branch.
 
 gitlink:git-cherry-pick[1]::
-	Cherry-pick the effect of an existing commit.
+	Apply the change introduced by an existing commit.
 
 gitlink:git-clean[1]::
 	Remove untracked files from the working tree.
@@ -35,7 +35,7 @@ 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.
+	Download objects and refs from another repository.
 
 gitlink:git-format-patch[1]::
 	Prepare patches for e-mail submission.
@@ -47,13 +47,13 @@ gitlink:gitk[1]::
 	The git repository browser.
 
 gitlink:git-log[1]::
-	Shows commit logs.
+	Show commit logs.
 
 gitlink:git-ls-remote[1]::
-	Shows references in a remote or local repository.
+	List references in a remote repository.
 
 gitlink:git-merge[1]::
-	Grand unified merge driver.
+	Join two or more development histories together.
 
 gitlink:git-mv[1]::
 	Move or rename a file, a directory, or a symlink.
@@ -62,13 +62,13 @@ 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.
+	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]::
-	Rebase local commits to the updated upstream head.
+	Forward-port local commits to the updated upstream head.
 
 gitlink:git-repack[1]::
 	Pack unpacked objects in a repository.
@@ -89,19 +89,20 @@ gitlink:git-rm[1]::
 	Remove files from the working tree and from the index.
 
 gitlink:git-shortlog[1]::
-	Summarizes 'git log' output.
+	Summarize 'git log' output.
 
 gitlink:git-show[1]::
-	Show one commit log and its diff.
+	Show various types of objects.
 
 gitlink:git-show-branch[1]::
 	Show branches and their commits.
 
 gitlink:git-status[1]::
-	Shows the working tree status.
+	Show 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.
+	Show logs with difference each commit introduces.
+
diff --git a/Documentation/cmds-plumbinginterrogators.txt b/Documentation/cmds-plumbinginterrogators.txt
index bdf3834123..28580eae99 100644
--- a/Documentation/cmds-plumbinginterrogators.txt
+++ b/Documentation/cmds-plumbinginterrogators.txt
@@ -4,14 +4,14 @@ gitlink:git-cat-file[1]::
 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-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.
+	Compares two merge stages in the index.
 
 gitlink:git-diff-tree[1]::
 	Compares the content and mode of blobs found via two tree objects.
@@ -23,13 +23,13 @@ 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.
+	Show information about files in the index and the working tree.
 
 gitlink:git-ls-tree[1]::
-	Displays a tree object in human readable form.
+	List the contents of a tree object.
 
 gitlink:git-merge-base[1]::
-	Finds as good common ancestors as possible for a merge.
+	Find as good common ancestors as possible for a merge.
 
 gitlink:git-name-rev[1]::
 	Find symbolic names for given revs.
@@ -41,20 +41,20 @@ gitlink:git-rev-list[1]::
 	Lists commit objects in reverse chronological order.
 
 gitlink:git-show-index[1]::
-	Displays contents of a pack idx file.
+	Show packed archive index.
 
 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.
+	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]::
-	Displays a git logical variable.
+	Show a git logical variable.
 
 gitlink:git-verify-pack[1]::
-	Validates packed git archive files.
+	Validate packed git archive files.
 
diff --git a/Documentation/cmds-plumbingmanipulators.txt b/Documentation/cmds-plumbingmanipulators.txt
index d5124cceed..4363877107 100644
--- a/Documentation/cmds-plumbingmanipulators.txt
+++ b/Documentation/cmds-plumbingmanipulators.txt
@@ -1,28 +1,26 @@
 gitlink:git-apply[1]::
-	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.
 
 gitlink:git-checkout-index[1]::
 	Copy files from the index to the working tree.
 
 gitlink:git-commit-tree[1]::
-	Creates a new commit object.
+	Create a new commit object.
 
 gitlink:git-hash-object[1]::
-	Computes the object ID from a file.
+	Compute object ID and optionally creates a blob from a file.
 
 gitlink:git-index-pack[1]::
-	Build pack idx file for an existing packed archive.
+	Build pack index file for an existing packed archive.
 
 gitlink:git-init[1]::
-	Creates an empty git repository, or reinitialize an
-	existing one.
+	Create an empty git repository or reinitialize an existing one.
 
 gitlink:git-merge-file[1]::
-	Runs a threeway merge.
+	Run a three-way file merge.
 
 gitlink:git-merge-index[1]::
-	Runs a merge for files needing merging.
+	Run a merge for files needing merging.
 
 gitlink:git-mktag[1]::
 	Creates a tag object.
@@ -31,7 +29,7 @@ gitlink:git-mktree[1]::
 	Build a tree-object from ls-tree formatted text.
 
 gitlink:git-pack-objects[1]::
-	Creates a packed archive of objects.
+	Create a packed archive of objects.
 
 gitlink:git-prune-packed[1]::
 	Remove extra objects that are already in pack files.
@@ -40,13 +38,14 @@ gitlink:git-read-tree[1]::
 	Reads tree information into the index.
 
 gitlink:git-repo-config[1]::
-	Get and set options in .git/config.
+	Get and set repository or global options.
 
 gitlink:git-unpack-objects[1]::
-	Unpacks objects out of a packed archive.
+	Unpack objects from a packed archive.
 
 gitlink:git-update-index[1]::
-	Registers files in the working tree to the index.
+	Register file contents in the working tree to the index.
 
 gitlink:git-write-tree[1]::
-	Creates a tree from the index.
+	Create a tree object from the current index.
+
diff --git a/Documentation/cmds-synchingrepositories.txt b/Documentation/cmds-synchingrepositories.txt
index b0baa7d522..01b5bb992e 100644
--- a/Documentation/cmds-synchingrepositories.txt
+++ b/Documentation/cmds-synchingrepositories.txt
@@ -1,46 +1,39 @@
 gitlink:git-fetch-pack[1]::
-	Updates from a remote repository (engine for ssh and
-	local transport).
+	Receive missing objects from another repository.
 
 gitlink:git-http-fetch[1]::
-	Downloads a remote git repository via HTTP by walking
-	commit chain.
+	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]::
-	Duplicates another git repository on a local system by
-	walking commit chain.
+	Duplicate another git repository on a local system.
 
 gitlink:git-peek-remote[1]::
-	Lists references on a remote repository using
-	upload-pack protocol (engine for ssh and local
-	transport).
+	List the references in a remote repository.
 
 gitlink:git-receive-pack[1]::
-	Invoked by 'git-send-pack' to receive what is pushed to it.
+	Receive what is pushed into the repository.
 
 gitlink:git-send-pack[1]::
-	Pushes to a remote repository, intelligently.
-
-gitlink:git-http-push[1]::
-	Push missing objects using HTTP/DAV.
+	Push objects over git protocol to another reposiotory.
 
 gitlink:git-shell[1]::
-	Restricted shell for GIT-only SSH access.
+	Restricted login shell for GIT-only SSH access.
 
 gitlink:git-ssh-fetch[1]::
-	Pulls from a remote repository over ssh connection by
-	walking commit chain.
+	Fetch from a remote repository over ssh connection.
 
 gitlink:git-ssh-upload[1]::
-	Helper "server-side" program used by git-ssh-fetch.
+	Push to a remote repository over ssh connection.
 
 gitlink:git-update-server-info[1]::
-	Updates auxiliary information on a dumb server to help
-	clients discover references and packs on it.
+	Update auxiliary info file to help dumb servers.
 
 gitlink:git-upload-archive[1]::
-	Invoked by 'git-archive' to send a generated archive.
+	Send archive back to git-archive.
 
 gitlink:git-upload-pack[1]::
-	Invoked by 'git-fetch-pack' to push
-	what are asked for.
+	Send objects packed back to git-fetch-pack.
+
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 53e81cb103..aa4ce1ddb0 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/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/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 33b93db508..065ba1bf24 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/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/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 031fcd5190..493474b2ee 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/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/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index ac4b4965a9..16ec7269b2 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/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/Documentation/git-branch.txt b/Documentation/git-branch.txt
index d5f8118261..aa1fdd402a 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/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/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 5e9cbf875d..7e90ce91bc 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/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/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt
index 765c173e15..6dd6db04bb 100644
--- a/Documentation/git-checkout-index.txt
+++ b/Documentation/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/Documentation/git-clone.txt b/Documentation/git-clone.txt
index a78207461d..707376f22c 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/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/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index f5d8050c9e..cf25507f8f 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/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/Documentation/git-commit.txt b/Documentation/git-commit.txt
index bd1c22b316..532703a674 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/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/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt
index c59df6438c..91c8c92c76 100644
--- a/Documentation/git-count-objects.txt
+++ b/Documentation/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/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt
index 092d0d6730..347cbcec35 100644
--- a/Documentation/git-cvsexportcommit.txt
+++ b/Documentation/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/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 44713949a5..f5450de74a 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/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/Documentation/git-diff-stages.txt b/Documentation/git-diff-stages.txt
index 3273918627..120d14e87e 100644
--- a/Documentation/git-diff-stages.txt
+++ b/Documentation/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/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index a9e86fd26b..7ecf2408d6 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/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/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 04e8d00436..5edc36f060 100644
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/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/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt
index 3d508094af..7dc2df3044 100644
--- a/Documentation/git-http-fetch.txt
+++ b/Documentation/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/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index c2485c6e9c..4b4a46169c 100644
--- a/Documentation/git-http-push.txt
+++ b/Documentation/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/Documentation/git-init.txt b/Documentation/git-init.txt
index 596b567c90..1b64d3ab03 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/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/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt
index 7dd393b97f..52a6aa6e82 100644
--- a/Documentation/git-instaweb.txt
+++ b/Documentation/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/Documentation/git-local-fetch.txt b/Documentation/git-local-fetch.txt
index 2fbdfe086a..22048d82bd 100644
--- a/Documentation/git-local-fetch.txt
+++ b/Documentation/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/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 8520b97111..79e0b7b71a 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/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/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index f283bacb65..7899394081 100644
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/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/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 1ff6e7d6c2..ba18133ead 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/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/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt
index 5a17801f6a..c11d6a530f 100644
--- a/Documentation/git-mailsplit.txt
+++ b/Documentation/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/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt
index 6099be2add..3190aed108 100644
--- a/Documentation/git-merge-base.txt
+++ b/Documentation/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/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index 29d3faa556..31882abb87 100644
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/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/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 0cf505ea84..b8ee1ff2b0 100644
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/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/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt
index 86aad37c6a..f80ab3b8c4 100644
--- a/Documentation/git-merge-one-file.txt
+++ b/Documentation/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/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0f79665ea6..3c08a6f7db 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/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/Documentation/git-mv.txt b/Documentation/git-mv.txt
index 207c43a631..6756b76bb1 100644
--- a/Documentation/git-mv.txt
+++ b/Documentation/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/Documentation/git-pack-redundant.txt b/Documentation/git-pack-redundant.txt
index 7d54b17e37..be2c64eb57 100644
--- a/Documentation/git-pack-redundant.txt
+++ b/Documentation/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/Documentation/git-parse-remote.txt b/Documentation/git-parse-remote.txt
index 918ca55f53..11b1f4d2e2 100644
--- a/Documentation/git-parse-remote.txt
+++ b/Documentation/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/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt
index 5389097f73..a7e9fd021a 100644
--- a/Documentation/git-patch-id.txt
+++ b/Documentation/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/Documentation/git-peek-remote.txt b/Documentation/git-peek-remote.txt
index a00060c507..ac57cda3a5 100644
--- a/Documentation/git-peek-remote.txt
+++ b/Documentation/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/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt
index a79193fb00..310033e460 100644
--- a/Documentation/git-prune-packed.txt
+++ b/Documentation/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/Documentation/git-pull.txt b/Documentation/git-pull.txt
index a90b764cc9..3e5f115728 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/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/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 03e867a403..0cb9e1f10a 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/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/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index 0dfadc2a32..10e8c46c4c 100644
--- a/Documentation/git-receive-pack.txt
+++ b/Documentation/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/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 0fa47e3b01..4a57ce8601 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/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/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt
index c55a8ba0dc..9db3d30825 100644
--- a/Documentation/git-repo-config.txt
+++ b/Documentation/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/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index c65c59e861..139b6eb773 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/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/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index 88f4e394ef..eea8fe8af3 100644
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/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/Documentation/git-shell.txt b/Documentation/git-shell.txt
index cc4266d83b..228b9f14f3 100644
--- a/Documentation/git-shell.txt
+++ b/Documentation/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/Documentation/git-ssh-fetch.txt b/Documentation/git-ssh-fetch.txt
index b7116b30e0..192b1f15a9 100644
--- a/Documentation/git-ssh-fetch.txt
+++ b/Documentation/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/Documentation/git-ssh-upload.txt b/Documentation/git-ssh-upload.txt
index 702674e45d..a9b7e9f974 100644
--- a/Documentation/git-ssh-upload.txt
+++ b/Documentation/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/Documentation/git-status.txt b/Documentation/git-status.txt
index 7f86d8cd5d..03871e5d73 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/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/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 321083d461..b95ff1da96 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/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/Documentation/git-symbolic-ref.txt b/Documentation/git-symbolic-ref.txt
index fec3b4f64a..f93b79a85e 100644
--- a/Documentation/git-symbolic-ref.txt
+++ b/Documentation/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/Documentation/git-tar-tree.txt b/Documentation/git-tar-tree.txt
index bc3360f079..595940524e 100644
--- a/Documentation/git-tar-tree.txt
+++ b/Documentation/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/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 0e0a3af1be..5bbae42d86 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/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/Documentation/git-update-ref.txt b/Documentation/git-update-ref.txt
index 71bcb7954f..9424feab32 100644
--- a/Documentation/git-update-ref.txt
+++ b/Documentation/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/Documentation/git-upload-archive.txt b/Documentation/git-upload-archive.txt
index 388bb53d29..403871d7c6 100644
--- a/Documentation/git-upload-archive.txt
+++ b/Documentation/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/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index b2c9307661..9da062d5c9 100644
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/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/Documentation/git-var.txt b/Documentation/git-var.txt
index a5b1a0dbab..8a50638e98 100644
--- a/Documentation/git-var.txt
+++ b/Documentation/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/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt
index c85fa89c30..96d5e07b11 100644
--- a/Documentation/git-write-tree.txt
+++ b/Documentation/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/Documentation/gitk.txt b/Documentation/gitk.txt
index 6e2a8782cd..5bdaa601f0 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -3,7 +3,7 @@ gitk(1)
 
 NAME
 ----
-gitk - git repository browser
+gitk - The git repository browser
 
 SYNOPSIS
 --------
-- 
GitLab