diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-27 11:55:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 11:55:43 -0800 |
| commit | d87aa329354be3d93c70547f4ed6fe52103ed1b5 (patch) | |
| tree | 981efea5f8888f4ae1bdde5cef3c0f2e3530c5eb /Makefile | |
| parent | f79ff5c975499089b03904a6619923683262bf22 (diff) | |
| parent | 2156435ff22437909cda825f1901dceb198fef19 (diff) | |
| download | git-d87aa329354be3d93c70547f4ed6fe52103ed1b5.tar.gz git-d87aa329354be3d93c70547f4ed6fe52103ed1b5.tar.xz | |
Merge branch 'jk/help-alias'
* jk/help-alias:
help: respect aliases
make alias lookup a public, procedural function
help: use parseopt
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -327,7 +327,8 @@ LIB_OBJS = \ alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \ color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \ convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o \ - transport.o bundle.o walker.o parse-options.o ws.o archive.o + transport.o bundle.o walker.o parse-options.o ws.o archive.o \ + alias.o BUILTIN_OBJS = \ builtin-add.o \ |