diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-04 00:14:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-04 00:14:56 -0700 |
| commit | 4cc0b8a41b25356ad89f13ec2735756e5dada02a (patch) | |
| tree | ac0ac1d6997364a99537b833355ec9b908868ff4 /Makefile | |
| parent | Merge branch 'master' into next (diff) | |
| parent | Add a conversion tool to migrate remote information into the config (diff) | |
| download | tgif-4cc0b8a41b25356ad89f13ec2735756e5dada02a.tar.xz | |
Merge branch 'js/fetchconfig' into next
* js/fetchconfig:
Add a conversion tool to migrate remote information into the config
fetch, pull: ask config for remote information
Add a few more words to the glossary.
Added definitions for a few words:
Alphabetize the glossary.
sha1_to_hex() usage cleanup
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -215,8 +215,8 @@ LIB_OBJS = \ $(DIFF_OBJS) BUILTIN_OBJS = \ - builtin-log.o builtin-help.o builtin-count.o builtin-diff.o \ - builtin-push.o builtin-grep.o + builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \ + builtin-grep.o GITLIBS = $(LIB_FILE) $(XDIFF_LIB) LIBS = $(GITLIBS) -lz |