aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-07 03:44:18 -0700
committerJunio C Hamano <junkio@cox.net>2005-10-07 03:44:18 -0700
commitd1c5f2a42d7b5c0e3d3862212dea1f09809c4963 (patch)
treeff961ebadc438c108ebad6c57242e21294edfe2e /Makefile
parentd4dbf36df0eb2efe78822704d9779d662ed4dd8a (diff)
downloadgit-d1c5f2a42d7b5c0e3d3862212dea1f09809c4963.tar.gz
git-d1c5f2a42d7b5c0e3d3862212dea1f09809c4963.tar.xz
Add git-am, applymbox replacement.
It reorganizes the code and also has saner command line options syntax. Unlike git-applymbox, it can take more than one mailbox file from the command line, as well as reading from the standard input when '-' is specified. 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 fd4e163ba..1bdf4de75 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ SCRIPT_SH = \
git-repack.sh git-request-pull.sh git-reset.sh \
git-resolve.sh git-revert.sh git-sh-setup.sh git-status.sh \
git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
- git-applymbox.sh git-applypatch.sh \
+ git-applymbox.sh git-applypatch.sh git-am.sh \
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
git-merge-resolve.sh git-grep.sh