diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | Documentation/cmd-list.perl | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | contrib/completion/git-completion.bash | 1 | ||||
| -rw-r--r-- | contrib/convert-objects/convert-objects.c (renamed from convert-objects.c) | 0 | ||||
| -rw-r--r-- | contrib/convert-objects/git-convert-objects.txt (renamed from Documentation/git-convert-objects.txt) | 0 |
6 files changed, 1 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 63c918c667..e0b91befb9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,6 @@ git-clone git-commit git-commit-tree git-config -git-convert-objects git-count-objects git-cvsexportcommit git-cvsimport diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl index 4ee76eaf99..1061fd8bcd 100755 --- a/Documentation/cmd-list.perl +++ b/Documentation/cmd-list.perl @@ -94,7 +94,6 @@ git-clone mainporcelain git-commit mainporcelain git-commit-tree plumbingmanipulators git-config ancillarymanipulators -git-convert-objects ancillarymanipulators git-count-objects ancillaryinterrogators git-cvsexportcommit foreignscminterface git-cvsimport foreignscminterface @@ -233,7 +233,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ # ... and all the rest that could be moved out of bindir to gitexecdir PROGRAMS = \ - git-convert-objects$X git-fetch-pack$X \ + git-fetch-pack$X \ git-hash-object$X git-index-pack$X git-local-fetch$X \ git-fast-import$X \ git-daemon$X \ diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index cad842af45..e760930740 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -299,7 +299,6 @@ __git_commands () check-attr) : plumbing;; check-ref-format) : plumbing;; commit-tree) : plumbing;; - convert-objects) : plumbing;; cvsexportcommit) : export;; cvsimport) : import;; cvsserver) : daemon;; diff --git a/convert-objects.c b/contrib/convert-objects/convert-objects.c index 90e7900e6d..90e7900e6d 100644 --- a/convert-objects.c +++ b/contrib/convert-objects/convert-objects.c diff --git a/Documentation/git-convert-objects.txt b/contrib/convert-objects/git-convert-objects.txt index 9718abf86d..9718abf86d 100644 --- a/Documentation/git-convert-objects.txt +++ b/contrib/convert-objects/git-convert-objects.txt |