summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-24 23:23:08 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-24 23:50:54 (GMT)
commitab9b31386b494b6c16d651d1560f3ba11c3a1964 (patch)
treeb236326ca11e2180a58dd15cbde457871bb56244 /Documentation/git.txt
parentff27adf3dae36695f1af1b6f0e01ec6738ce0249 (diff)
downloadgit-ab9b31386b494b6c16d651d1560f3ba11c3a1964.zip
git-ab9b31386b494b6c16d651d1560f3ba11c3a1964.tar.gz
git-ab9b31386b494b6c16d651d1560f3ba11c3a1964.tar.bz2
Documentation: multi-head fetch.
Add documentation related to multi-head work, including $GIT_DIR/remotes/ changes. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt17
1 files changed, 10 insertions, 7 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index d133250..664b88a 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -208,7 +208,16 @@ link:git-fetch-script.html[git-fetch-script]::
link:git-pull-script.html[git-pull-script]::
Fetch from and merge with a remote repository.
-ulink:git-commit-script.html[git-commit-script]::
+link:git-resolve-script.html[git-resolve-script]::
+ Merge two commits.
+
+link:git-octopus-script.html[git-octopus-script]::
+ Merge more than two commits.
+
+link:git-push-script.html[git-push-script]::
+ Update remote refs along with associated objects.
+
+link:git-commit-script.html[git-commit-script]::
Record changes to the repository.
link:git-show-branch.html[git-show-branch]::
@@ -240,9 +249,6 @@ link:git-merge-one-file-script.html[git-merge-one-file-script]::
link:git-prune-script.html[git-prune-script]::
Prunes all unreachable objects from the object database
-link:git-resolve-script.html[git-resolve-script]::
- Script used to merge two trees
-
link:git-tag-script.html[git-tag-script]::
An example script to create a tag object signed with GPG
@@ -316,9 +322,6 @@ link:git-get-tar-commit-id.html[git-get-tar-commit-id]::
link:git-patch-id.html[git-patch-id]::
git-patch-id.
-link:git-push-script.html[git-push-script]::
- git-push-script.
-
link:git-rebase-script.html[git-rebase-script]::
git-rebase-script.