Skip to content

Commit e32faa8

Browse files
author
Junio C Hamano
committed
Remove "octopus".
We still advertise "git resolve" as a standalone command, but never "git octopus", so nobody should be using it and it is safe to retire it. The functionality is still available as a strategy backend. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent ba922cc commit e32faa8

File tree

5 files changed

+1
-133
lines changed

5 files changed

+1
-133
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ git-merge-stupid
6060
git-mktag
6161
git-name-rev
6262
git-mv
63-
git-octopus
6463
git-pack-redundant
6564
git-pack-objects
6665
git-parse-remote

‎Documentation/git-octopus.txt‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎Documentation/git.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,6 @@ gitlink:git-merge[1]::
297297
gitlink:git-mv[1]::
298298
Move or rename a file, a directory, or a symlink.
299299

300-
gitlink:git-octopus[1]::
301-
Merge more than two commits.
302-
303300
gitlink:git-pull[1]::
304301
Fetch from and merge with a remote repository.
305302

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ SCRIPT_SH = \
8989
git-cherry.sh git-clone.sh git-commit.sh \
9090
git-count-objects.sh git-diff.sh git-fetch.sh \
9191
git-format-patch.sh git-log.sh git-ls-remote.sh \
92-
git-merge-one-file.sh git-octopus.sh git-parse-remote.sh \
92+
git-merge-one-file.sh git-parse-remote.sh \
9393
git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
9494
git-repack.sh git-request-pull.sh git-reset.sh \
9595
git-resolve.sh git-revert.sh git-sh-setup.sh git-status.sh \

‎git-octopus.sh‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)