From: Junio C Hamano Date: Tue, 13 Nov 2007 08:21:11 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3.5-652-gf192c X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14aca6e3dcbe193374c3203aeebfe7d1c52d7963;p=git.git Autogenerated HTML docs for v1.5.3.5-652-gf192c --- diff --git a/core-tutorial.html b/core-tutorial.html index ebf7da11b..72122c4d2 100644 --- a/core-tutorial.html +++ b/core-tutorial.html @@ -1321,10 +1321,6 @@ server like git Native transport does. Any stock HTTP server that does not even support directory index would suffice. But you must prepare your repository with git-update-server-info to help dumb transport downloaders.

-

There are (confusingly enough) git-ssh-fetch and git-ssh-upload -programs, which are commit walkers; they outlived their -usefulness when git Native and SSH transports were introduced, -and are not used by git pull or git push scripts.

Once you fetch from the remote repository, you merge that @@ -1971,7 +1967,7 @@ to follow, not easier.

diff --git a/core-tutorial.txt b/core-tutorial.txt index ebd2492bc..401d1deca 100644 --- a/core-tutorial.txt +++ b/core-tutorial.txt @@ -1090,11 +1090,6 @@ server like git Native transport does. Any stock HTTP server that does not even support directory index would suffice. But you must prepare your repository with `git-update-server-info` to help dumb transport downloaders. -+ -There are (confusingly enough) `git-ssh-fetch` and `git-ssh-upload` -programs, which are 'commit walkers'; they outlived their -usefulness when git Native and SSH transports were introduced, -and are not used by `git pull` or `git push` scripts. Once you fetch from the remote repository, you `merge` that with your current branch. diff --git a/git-branch.html b/git-branch.html index 957b9da8e..d99bac8f5 100644 --- a/git-branch.html +++ b/git-branch.html @@ -439,7 +439,7 @@ to delete remote-tracking branches.

- When -b is given and a branch is created off a remote branch, + When a branch is created off a remote branch, set up configuration so that git-pull will not retrieve data from the remote branch, ignoring the branch.autosetupmerge configuration variable. @@ -555,7 +555,7 @@ a branch and check it out with a single command.

diff --git a/git-branch.txt b/git-branch.txt index 5e81aa4ee..5ce905de8 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -105,7 +105,7 @@ OPTIONS '--track' were given. --no-track:: - When -b is given and a branch is created off a remote branch, + When a branch is created off a remote branch, set up configuration so that git-pull will not retrieve data from the remote branch, ignoring the branch.autosetupmerge configuration variable. diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index 08457f03e..cafd2be49 100644 --- a/git-get-tar-commit-id.html +++ b/git-get-tar-commit-id.html @@ -277,11 +277,11 @@ git-get-tar-commit-id(1) Manual Page

DESCRIPTION

Acts as a filter, extracting the commit ID stored in archives created by -git-tar-tree. It reads only the first 1024 bytes of input, thus its +git-archive(1). It reads only the first 1024 bytes of input, thus its runtime is not influenced by the size of <tarfile> very much.

If no commit ID is found, git-get-tar-commit-id quietly exists with a return code of 1. This can happen if <tarfile> had not been created -using git-tar-tree or if the first parameter of git-tar-tree had been +using git-archive or if the <treeish> parameter of git-archive had been a tree ID instead of a commit ID or tag.

Author

@@ -298,7 +298,7 @@ a tree ID instead of a commit ID or tag.

diff --git a/git-get-tar-commit-id.txt b/git-get-tar-commit-id.txt index 9b5f86fc3..76316bbc9 100644 --- a/git-get-tar-commit-id.txt +++ b/git-get-tar-commit-id.txt @@ -14,12 +14,12 @@ SYNOPSIS DESCRIPTION ----------- Acts as a filter, extracting the commit ID stored in archives created by -git-tar-tree. It reads only the first 1024 bytes of input, thus its +gitlink:git-archive[1]. It reads only the first 1024 bytes of input, thus its runtime is not influenced by the size of very much. If no commit ID is found, git-get-tar-commit-id quietly exists with a return code of 1. This can happen if had not been created -using git-tar-tree or if the first parameter of git-tar-tree had been +using git-archive or if the parameter of git-archive had been a tree ID instead of a commit ID or tag.