diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-08 18:47:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-08 18:49:37 -0800 |
| commit | acca687fa9db8eaa380b65d63c3f0d4364892acf (patch) | |
| tree | 93190f338cbb862eacaf8bddf09e93af458783a7 /Makefile | |
| parent | 659db3f673fe199bad6ce9cc625d3a1b098bfbcf (diff) | |
| download | git-acca687fa9db8eaa380b65d63c3f0d4364892acf.tar.gz git-acca687fa9db8eaa380b65d63c3f0d4364892acf.tar.xz | |
git-pickaxe: retire pickaxe
Just make it take over blame's place. Documentation and command
have all stopped mentioning "git-pickaxe". The built-in synonym
is left in the command table, so you can still say "git pickaxe",
but it probably is a good idea to retire it as well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -201,7 +201,7 @@ PROGRAMS = \ git-update-server-info$X \ git-upload-pack$X git-verify-pack$X \ git-pack-redundant$X git-var$X \ - git-describe$X git-merge-tree$X git-blame$X git-imap-send$X \ + git-describe$X git-merge-tree$X git-imap-send$X \ git-merge-recursive$X \ $(EXTRA_PROGRAMS) @@ -267,6 +267,7 @@ BUILTIN_OBJS = \ builtin-annotate.o \ builtin-apply.o \ builtin-archive.o \ + builtin-blame.o \ builtin-branch.o \ builtin-cat-file.o \ builtin-checkout-index.o \ @@ -290,7 +291,6 @@ BUILTIN_OBJS = \ builtin-mv.o \ builtin-name-rev.o \ builtin-pack-objects.o \ - builtin-pickaxe.o \ builtin-prune.o \ builtin-prune-packed.o \ builtin-push.o \ |