Skip to content

Commit c3f0baa

Browse files
author
Junio C Hamano
committed
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>
1 parent 377e813 commit c3f0baa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+132
-143
lines changed

‎Documentation/cmds-ancillaryinterrogators.txt‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ gitlink:git-annotate[1]::
22
Annotate file lines with commit info.
33

44
gitlink:git-blame[1]::
5-
Find out where each line in a file came from.
5+
Show what revision and author last modified each line of a file.
66

77
gitlink:git-check-ref-format[1]::
88
Make sure ref name is well formed.
@@ -29,25 +29,22 @@ gitlink:git-instaweb[1]::
2929
Instantly browse your working repository in gitweb.
3030

3131
gitlink:git-mailinfo[1]::
32-
Extracts patch and authorship information from a single
33-
e-mail message, optionally transliterating the commit
34-
message into utf-8.
32+
Extracts patch and authorship from a single e-mail message.
3533

3634
gitlink:git-mailsplit[1]::
37-
A stupid program to split UNIX mbox format mailbox into
38-
individual pieces of e-mail.
35+
Simple UNIX mbox splitter program.
3936

4037
gitlink:git-merge-tree[1]::
4138
Show three-way merge without touching index.
4239

40+
gitlink:git-parse-remote[1]::
41+
Routines to help parsing remote repository access parameters.
42+
4343
gitlink:git-patch-id[1]::
4444
Compute unique ID for a patch.
4545

46-
gitlink:git-parse-remote[1]::
47-
Routines to help parsing `$GIT_DIR/remotes/` files.
48-
4946
gitlink:git-request-pull[1]::
50-
git-request-pull.
47+
Generates a summary of pending changes.
5148

5249
gitlink:git-rev-parse[1]::
5350
Pick out and massage parameters.
@@ -56,10 +53,11 @@ gitlink:git-runstatus[1]::
5653
A helper for git-status and git-commit.
5754

5855
gitlink:git-send-email[1]::
59-
Send patch e-mails out of "format-patch --mbox" output.
56+
Send a collection of patches as emails.
57+
58+
gitlink:git-stripspace[1]::
59+
Filter out empty lines.
6060

6161
gitlink:git-symbolic-ref[1]::
6262
Read and modify symbolic refs.
6363

64-
gitlink:git-stripspace[1]::
65-
Filter out empty lines.

‎Documentation/cmds-ancillarymanipulators.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ gitlink:git-applypatch[1]::
22
Apply one patch extracted from an e-mail.
33

44
gitlink:git-archimport[1]::
5-
Import an arch repository into git.
5+
Import an Arch repository into git.
66

77
gitlink:git-convert-objects[1]::
88
Converts old-style git repository.
99

10-
gitlink:git-cvsimport[1]::
11-
Salvage your data out of another SCM people love to hate.
12-
1310
gitlink:git-cvsexportcommit[1]::
1411
Export a single commit to a CVS checkout.
1512

13+
gitlink:git-cvsimport[1]::
14+
Salvage your data out of another SCM people love to hate.
15+
1616
gitlink:git-cvsserver[1]::
1717
A CVS server emulator for git.
1818

@@ -23,7 +23,7 @@ gitlink:git-lost-found[1]::
2323
Recover lost refs that luckily have not yet been pruned.
2424

2525
gitlink:git-merge-one-file[1]::
26-
The standard helper program to use with `git-merge-index`.
26+
The standard helper program to use with git-merge-index.
2727

2828
gitlink:git-prune[1]::
2929
Prunes all unreachable objects from the object database.
@@ -37,15 +37,15 @@ gitlink:git-reflog[1]::
3737
gitlink:git-relink[1]::
3838
Hardlink common objects in local repositories.
3939

40+
gitlink:git-sh-setup[1]::
41+
Common git shell script setup code.
42+
4043
gitlink:git-svn[1]::
4144
Bidirectional operation between a single Subversion branch and git.
4245

4346
gitlink:git-svnimport[1]::
4447
Import a SVN repository into git.
4548

46-
gitlink:git-sh-setup[1]::
47-
Common git shell script setup code.
48-
4949
gitlink:git-symbolic-ref[1]::
5050
Read and modify symbolic refs.
5151

‎Documentation/cmds-mainporcelain.txt‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
gitlink:git-add[1]::
2-
Add paths to the index.
2+
Add file contents to the changeset to be committed next.
33

44
gitlink:git-am[1]::
5-
Apply patches from a mailbox, but cooler.
5+
Apply a series of patches from a mailbox.
66

77
gitlink:git-applymbox[1]::
8-
Apply patches from a mailbox, original version by Linus.
8+
Apply a series of patches in a mailbox.
99

1010
gitlink:git-archive[1]::
1111
Creates an archive of files from a named tree.
@@ -14,13 +14,13 @@ gitlink:git-bisect[1]::
1414
Find the change that introduced a bug by binary search.
1515

1616
gitlink:git-branch[1]::
17-
Create and Show branches.
17+
List, create, or delete branches.
1818

1919
gitlink:git-checkout[1]::
2020
Checkout and switch to a branch.
2121

2222
gitlink:git-cherry-pick[1]::
23-
Cherry-pick the effect of an existing commit.
23+
Apply the change introduced by an existing commit.
2424

2525
gitlink:git-clean[1]::
2626
Remove untracked files from the working tree.
@@ -35,7 +35,7 @@ gitlink:git-diff[1]::
3535
Show changes between commits, commit and working tree, etc.
3636

3737
gitlink:git-fetch[1]::
38-
Download from a remote repository via various protocols.
38+
Download objects and refs from another repository.
3939

4040
gitlink:git-format-patch[1]::
4141
Prepare patches for e-mail submission.
@@ -47,13 +47,13 @@ gitlink:gitk[1]::
4747
The git repository browser.
4848

4949
gitlink:git-log[1]::
50-
Shows commit logs.
50+
Show commit logs.
5151

5252
gitlink:git-ls-remote[1]::
53-
Shows references in a remote or local repository.
53+
List references in a remote repository.
5454

5555
gitlink:git-merge[1]::
56-
Grand unified merge driver.
56+
Join two or more development histories together.
5757

5858
gitlink:git-mv[1]::
5959
Move or rename a file, a directory, or a symlink.
@@ -62,13 +62,13 @@ gitlink:git-pack-refs[1]::
6262
Pack heads and tags for efficient repository access.
6363

6464
gitlink:git-pull[1]::
65-
Fetch from and merge with a remote repository or a local branch.
65+
Fetch from and merge with another repository or a local branch.
6666

6767
gitlink:git-push[1]::
6868
Update remote refs along with associated objects.
6969

7070
gitlink:git-rebase[1]::
71-
Rebase local commits to the updated upstream head.
71+
Forward-port local commits to the updated upstream head.
7272

7373
gitlink:git-repack[1]::
7474
Pack unpacked objects in a repository.
@@ -89,19 +89,20 @@ gitlink:git-rm[1]::
8989
Remove files from the working tree and from the index.
9090

9191
gitlink:git-shortlog[1]::
92-
Summarizes 'git log' output.
92+
Summarize 'git log' output.
9393

9494
gitlink:git-show[1]::
95-
Show one commit log and its diff.
95+
Show various types of objects.
9696

9797
gitlink:git-show-branch[1]::
9898
Show branches and their commits.
9999

100100
gitlink:git-status[1]::
101-
Shows the working tree status.
101+
Show the working tree status.
102102

103103
gitlink:git-verify-tag[1]::
104104
Check the GPG signature of tag.
105105

106106
gitlink:git-whatchanged[1]::
107-
Shows commit logs and differences they introduce.
107+
Show logs with difference each commit introduces.
108+

‎Documentation/cmds-plumbinginterrogators.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ gitlink:git-cat-file[1]::
44
gitlink:git-describe[1]::
55
Show the most recent tag that is reachable from a commit.
66

7-
gitlink:git-diff-index[1]::
8-
Compares content and mode of blobs between the index and repository.
9-
107
gitlink:git-diff-files[1]::
118
Compares files in the working tree and the index.
129

10+
gitlink:git-diff-index[1]::
11+
Compares content and mode of blobs between the index and repository.
12+
1313
gitlink:git-diff-stages[1]::
14-
Compares two "merge stages" in the index.
14+
Compares two merge stages in the index.
1515

1616
gitlink:git-diff-tree[1]::
1717
Compares the content and mode of blobs found via two tree objects.
@@ -23,13 +23,13 @@ gitlink:git-fsck-objects[1]::
2323
Verifies the connectivity and validity of the objects in the database.
2424

2525
gitlink:git-ls-files[1]::
26-
Information about files in the index and the working tree.
26+
Show information about files in the index and the working tree.
2727

2828
gitlink:git-ls-tree[1]::
29-
Displays a tree object in human readable form.
29+
List the contents of a tree object.
3030

3131
gitlink:git-merge-base[1]::
32-
Finds as good common ancestors as possible for a merge.
32+
Find as good common ancestors as possible for a merge.
3333

3434
gitlink:git-name-rev[1]::
3535
Find symbolic names for given revs.
@@ -41,20 +41,20 @@ gitlink:git-rev-list[1]::
4141
Lists commit objects in reverse chronological order.
4242

4343
gitlink:git-show-index[1]::
44-
Displays contents of a pack idx file.
44+
Show packed archive index.
4545

4646
gitlink:git-show-ref[1]::
4747
List references in a local repository.
4848

4949
gitlink:git-tar-tree[1]::
50-
Creates a tar archive of the files in the named tree object.
50+
Create a tar archive of the files in the named tree object.
5151

5252
gitlink:git-unpack-file[1]::
5353
Creates a temporary file with a blob's contents.
5454

5555
gitlink:git-var[1]::
56-
Displays a git logical variable.
56+
Show a git logical variable.
5757

5858
gitlink:git-verify-pack[1]::
59-
Validates packed git archive files.
59+
Validate packed git archive files.
6060

‎Documentation/cmds-plumbingmanipulators.txt‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
gitlink:git-apply[1]::
2-
Reads a "diff -up1" or git generated patch file and
3-
applies it to the working tree.
2+
Apply a patch on a git index file and a working tree.
43

54
gitlink:git-checkout-index[1]::
65
Copy files from the index to the working tree.
76

87
gitlink:git-commit-tree[1]::
9-
Creates a new commit object.
8+
Create a new commit object.
109

1110
gitlink:git-hash-object[1]::
12-
Computes the object ID from a file.
11+
Compute object ID and optionally creates a blob from a file.
1312

1413
gitlink:git-index-pack[1]::
15-
Build pack idx file for an existing packed archive.
14+
Build pack index file for an existing packed archive.
1615

1716
gitlink:git-init[1]::
18-
Creates an empty git repository, or reinitialize an
19-
existing one.
17+
Create an empty git repository or reinitialize an existing one.
2018

2119
gitlink:git-merge-file[1]::
22-
Runs a threeway merge.
20+
Run a three-way file merge.
2321

2422
gitlink:git-merge-index[1]::
25-
Runs a merge for files needing merging.
23+
Run a merge for files needing merging.
2624

2725
gitlink:git-mktag[1]::
2826
Creates a tag object.
@@ -31,7 +29,7 @@ gitlink:git-mktree[1]::
3129
Build a tree-object from ls-tree formatted text.
3230

3331
gitlink:git-pack-objects[1]::
34-
Creates a packed archive of objects.
32+
Create a packed archive of objects.
3533

3634
gitlink:git-prune-packed[1]::
3735
Remove extra objects that are already in pack files.
@@ -40,13 +38,14 @@ gitlink:git-read-tree[1]::
4038
Reads tree information into the index.
4139

4240
gitlink:git-repo-config[1]::
43-
Get and set options in .git/config.
41+
Get and set repository or global options.
4442

4543
gitlink:git-unpack-objects[1]::
46-
Unpacks objects out of a packed archive.
44+
Unpack objects from a packed archive.
4745

4846
gitlink:git-update-index[1]::
49-
Registers files in the working tree to the index.
47+
Register file contents in the working tree to the index.
5048

5149
gitlink:git-write-tree[1]::
52-
Creates a tree from the index.
50+
Create a tree object from the current index.
51+

‎Documentation/cmds-synchingrepositories.txt‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,39 @@
11
gitlink:git-fetch-pack[1]::
2-
Updates from a remote repository (engine for ssh and
3-
local transport).
2+
Receive missing objects from another repository.
43

54
gitlink:git-http-fetch[1]::
6-
Downloads a remote git repository via HTTP by walking
7-
commit chain.
5+
Download from a remote git repository via HTTP.
6+
7+
gitlink:git-http-push[1]::
8+
Push objects over HTTP/DAV to another repository.
89

910
gitlink:git-local-fetch[1]::
10-
Duplicates another git repository on a local system by
11-
walking commit chain.
11+
Duplicate another git repository on a local system.
1212

1313
gitlink:git-peek-remote[1]::
14-
Lists references on a remote repository using
15-
upload-pack protocol (engine for ssh and local
16-
transport).
14+
List the references in a remote repository.
1715

1816
gitlink:git-receive-pack[1]::
19-
Invoked by 'git-send-pack' to receive what is pushed to it.
17+
Receive what is pushed into the repository.
2018

2119
gitlink:git-send-pack[1]::
22-
Pushes to a remote repository, intelligently.
23-
24-
gitlink:git-http-push[1]::
25-
Push missing objects using HTTP/DAV.
20+
Push objects over git protocol to another reposiotory.
2621

2722
gitlink:git-shell[1]::
28-
Restricted shell for GIT-only SSH access.
23+
Restricted login shell for GIT-only SSH access.
2924

3025
gitlink:git-ssh-fetch[1]::
31-
Pulls from a remote repository over ssh connection by
32-
walking commit chain.
26+
Fetch from a remote repository over ssh connection.
3327

3428
gitlink:git-ssh-upload[1]::
35-
Helper "server-side" program used by git-ssh-fetch.
29+
Push to a remote repository over ssh connection.
3630

3731
gitlink:git-update-server-info[1]::
38-
Updates auxiliary information on a dumb server to help
39-
clients discover references and packs on it.
32+
Update auxiliary info file to help dumb servers.
4033

4134
gitlink:git-upload-archive[1]::
42-
Invoked by 'git-archive' to send a generated archive.
35+
Send archive back to git-archive.
4336

4437
gitlink:git-upload-pack[1]::
45-
Invoked by 'git-fetch-pack' to push
46-
what are asked for.
38+
Send objects packed back to git-fetch-pack.
39+

0 commit comments

Comments
 (0)