diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-18 23:56:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-18 23:56:01 -0800 |
| commit | 154c7d0759b6885034bffa7a34d464d703fc8bb3 (patch) | |
| tree | 9a53213c3c9d39643d7451cb57316935eb634f5f /Documentation/core-tutorial.txt | |
| parent | GIT 1.5.3.6 (diff) | |
| parent | Documentation: Fix references to deprecated commands (diff) | |
| download | tgif-154c7d0759b6885034bffa7a34d464d703fc8bb3.tar.xz | |
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
* 'maint' of git://linux-nfs.org/~bfields/git:
Documentation: Fix references to deprecated commands
user-manual: mention "..." in "Generating diffs", etc.
user-manual: Add section "Why bisecting merge commits can be harder ..."
git-remote.txt: fix example url
Diffstat (limited to 'Documentation/core-tutorial.txt')
| -rw-r--r-- | Documentation/core-tutorial.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index c126038c1f..c3f0be535d 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -1082,11 +1082,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 not used by `git pull` or `git push` scripts. Once you fetch from the remote repository, you `merge` that with your current branch. |