]> git.ipfire.org Git - thirdparty/git.git/commit - Makefile
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ba922cc) | patch
Remove "octopus".
authorJunio C Hamano <junkio@cox.net>
Tue, 20 Dec 2005 02:03:31 +0000 (18:03 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 20 Dec 2005 02:05:49 +0000 (18:05 -0800)
commite32faa8adbc8ba9803088e849bc26680134c853c
tree34d0211f016fa52223cbfd9101a57004ed40f6cctree | snapshot
parentba922ccee7565c949b4db318e5c27997cbdbfdbacommit | diff
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>
.gitignore diff | blob | blame | history
Documentation/git-octopus.txt [deleted file] blob | blame | history
Documentation/git.txt diff | blob | blame | history
Makefile diff | blob | blame | history
git-octopus.sh [deleted file] blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.