diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-12-19 18:03:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-19 18:05:49 -0800 |
| commit | e32faa8adbc8ba9803088e849bc26680134c853c (patch) | |
| tree | 34d0211f016fa52223cbfd9101a57004ed40f6cc /.gitignore | |
| parent | Remove unused cmd-rename.sh (diff) | |
| download | tgif-e32faa8adbc8ba9803088e849bc26680134c853c.tar.xz | |
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>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 8a6bd02d4f..6bd508e4be 100644 --- a/.gitignore +++ b/.gitignore @@ -60,7 +60,6 @@ git-merge-stupid git-mktag git-name-rev git-mv -git-octopus git-pack-redundant git-pack-objects git-parse-remote |