Skip to content

Commit 204ee6a

Browse files
lbtJunio C Hamano
authored andcommitted
[PATCH 2/4] split core-git.txt and update
Rearrange commands in git.txt Signed-off-by: David Greaves <david@dgreaves.com>
1 parent 2cf565c commit 204ee6a

File tree

1 file changed

+48
-36
lines changed

1 file changed

+48
-36
lines changed

Documentation/git.txt

Lines changed: 48 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -32,56 +32,30 @@ The git commands can helpfully be split into those that manipulate
3232
the repository, the cache and the working fileset and those that
3333
interrogate and compare them.
3434

35+
There are also some ancilliary programs that can be viewed as useful
36+
aids for using the core commands but which are unlikely to be used by
37+
SCMs layered over git.
38+
3539
Manipulation commands
3640
~~~~~~~~~~~~~~~~~~~~~
37-
link:git-apply-patch-script.html[git-apply-patch-script]::
38-
Sample script to apply the diffs from git-diff-*
39-
4041
link:git-checkout-cache.html[git-checkout-cache]::
4142
Copy files from the cache to the working directory
4243

4344
link:git-commit-tree.html[git-commit-tree]::
4445
Creates a new commit object
4546

46-
link:git-convert-cache.html[git-convert-cache]::
47-
Converts old-style GIT repository
48-
49-
link:git-http-pull.html[git-http-pull]::
50-
Downloads a remote GIT repository via HTTP
51-
5247
link:git-init-db.html[git-init-db]::
5348
Creates an empty git object database
5449

55-
link:git-local-pull.html[git-local-pull]::
56-
Duplicates another GIT repository on a local system
57-
5850
link:git-merge-base.html[git-merge-base]::
5951
Finds as good a common ancestor as possible for a merge
6052

61-
link:git-merge-one-file-script.html[git-merge-one-file-script]::
62-
The standard helper program to use with "git-merge-cache"
63-
6453
link:git-mktag.html[git-mktag]::
6554
Creates a tag object
6655

67-
link:git-prune-script.html[git-prune-script]::
68-
Prunes all unreachable objects from the object database
69-
70-
link:git-pull-script.html[git-pull-script]::
71-
Script used by Linus to pull and merge a remote repository
72-
7356
link:git-read-tree.html[git-read-tree]::
7457
Reads tree information into the directory cache
7558

76-
link:git-resolve-script.html[git-resolve-script]::
77-
Script used to merge two trees
78-
79-
link:git-rpull.html[git-rpull]::
80-
Pulls from a remote repository over ssh connection
81-
82-
link:git-tag-script.html[git-tag-script]::
83-
An example script to create a tag object signed with GPG
84-
8559
link:git-update-cache.html[git-update-cache]::
8660
Modifies the index or directory cache
8761

@@ -108,9 +82,6 @@ link:git-diff-files.html[git-diff-files]::
10882
link:git-diff-tree.html[git-diff-tree]::
10983
Compares the content and mode of blobs found via two tree objects
11084

111-
link:git-diff-tree-helper.html[git-diff-tree-helper]::
112-
Generates patch format output for git-diff-*
113-
11485
link:git-export.html[git-export]::
11586
Exports each commit and a diff against each of its parents
11687

@@ -132,9 +103,6 @@ link:git-rev-list.html[git-rev-list]::
132103
link:git-rev-tree.html[git-rev-tree]::
133104
Provides the revision tree for one or more commits
134105

135-
link:git-rpush.html[git-rpush]::
136-
Helper "server-side" program used by git-rpull
137-
138106
link:git-tar-tree.html[git-tar-tree]::
139107
Creates a tar archive of the files in the named tree
140108

@@ -145,6 +113,50 @@ The interrogate commands may create files - and you can force them to
145113
touch the working file set - but in general they don't
146114

147115

116+
Ancilliary Commands
117+
-------------------
118+
Manipulators:
119+
120+
link:git-apply-patch-script.html[git-apply-patch-script]::
121+
Sample script to apply the diffs from git-diff-*
122+
123+
link:git-convert-cache.html[git-convert-cache]::
124+
Converts old-style GIT repository
125+
126+
link:git-http-pull.html[git-http-pull]::
127+
Downloads a remote GIT repository via HTTP
128+
129+
link:git-local-pull.html[git-local-pull]::
130+
Duplicates another GIT repository on a local system
131+
132+
link:git-merge-one-file-script.html[git-merge-one-file-script]::
133+
The standard helper program to use with "git-merge-cache"
134+
135+
link:git-pull-script.html[git-pull-script]::
136+
Script used by Linus to pull and merge a remote repository
137+
138+
link:git-prune-script.html[git-prune-script]::
139+
Prunes all unreachable objects from the object database
140+
141+
link:git-resolve-script.html[git-resolve-script]::
142+
Script used to merge two trees
143+
144+
link:git-tag-script.html[git-tag-script]::
145+
An example script to create a tag object signed with GPG
146+
147+
link:git-rpull.html[git-rpull]::
148+
Pulls from a remote repository over ssh connection
149+
150+
Interogators:
151+
152+
link:git-diff-tree-helper.html[git-diff-tree-helper]::
153+
Generates patch format output for git-diff-*
154+
155+
link:git-rpush.html[git-rpush]::
156+
Helper "server-side" program used by git-rpull
157+
158+
159+
148160
Terminology
149161
-----------
150162
see README for description

0 commit comments

Comments
 (0)