summaryrefslogtreecommitdiffstats
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-21 00:01:00 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-21 00:01:00 -0800
commitc2f3bf071ee90b01f2d629921bb04c4f798f02fa (patch)
tree08ffe5b40e062d596deee47f3869278f4661a858 /Documentation/git.txt
parentGIT 0.99.9n aka 1.0rc6 (diff)
parentMake "git-send-pack" less verbose by default (diff)
downloadgit-1.0.0.tar.gz
git-1.0.0.zip
GIT 1.0.0v1.0.0
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt3
1 files changed, 0 insertions, 3 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 482eba7eba..5f068c2a1a 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -297,9 +297,6 @@ gitlink:git-merge[1]::
gitlink:git-mv[1]::
Move or rename a file, a directory, or a symlink.
-gitlink:git-octopus[1]::
- Merge more than two commits.
-
gitlink:git-pull[1]::
Fetch from and merge with a remote repository.