summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2007-05-20 00:10:13 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-25 04:36:53 (GMT)
commitd45cc6e2670bbfecb16c608a2bb0e3f358a9ece7 (patch)
tree0bc0710ecaed87129eaf8dd9af0c07c972935c98 /Makefile
parent18bece43675ea0dc9022a7868865e02808b7af7f (diff)
downloadgit-d45cc6e2670bbfecb16c608a2bb0e3f358a9ece7.zip
git-d45cc6e2670bbfecb16c608a2bb0e3f358a9ece7.tar.gz
git-d45cc6e2670bbfecb16c608a2bb0e3f358a9ece7.tar.bz2
git-applymbox: Remove command
I believe noone uses git-applymbox, and noone definitely should, since it is supposed to be completely superseded and everything by its younger cousin git-am. The only known person in the universe to use it was Linus and he declared some time ago that he will try to use git-am instead in his famous dotest script. The trouble is that git-applymbox existence creates confusing UI. I'm a bit like a recycled newbie to the git porcelain and *I* was confused by git-applymbox primitiveness until I've realized a while later that I'm of course using the wrong command. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 29243c6..870179b 100644
--- a/Makefile
+++ b/Makefile
@@ -206,7 +206,7 @@ SCRIPT_SH = \
git-repack.sh git-request-pull.sh git-reset.sh \
git-sh-setup.sh \
git-tag.sh git-verify-tag.sh \
- git-applymbox.sh git-applypatch.sh git-am.sh \
+ git-applypatch.sh git-am.sh \
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
git-merge-resolve.sh git-merge-ours.sh \
git-lost-found.sh git-quiltimport.sh