X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit.txt;h=5f068c2a1ab225755a443f6a34e3c4797481cd16;hb=50b4e0c178777a27164eb67676593255a9cbd035;hp=482eba7eba29b2bad53380a1eba4c4aa16083fab;hpb=9755afbd9467759bb77a6e5a535791243c5b907d;p=git.git diff --git a/Documentation/git.txt b/Documentation/git.txt index 482eba7e..5f068c2a 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.