summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-29 08:24:20 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-29 08:24:20 (GMT)
commit322bcd9a9a2c0081c66414bde64e0d443c9ec922 (patch)
tree035f3344d2aba30f946fb545bfc9b6a9b7ee3d37 /Makefile
parenta77a33a51df9b7655d80299487ec6fbb10445496 (diff)
parent8558fd9ece4c8250a037a6d5482a8040d600ef47 (diff)
downloadgit-322bcd9a9a2c0081c66414bde64e0d443c9ec922.zip
git-322bcd9a9a2c0081c66414bde64e0d443c9ec922.tar.gz
git-322bcd9a9a2c0081c66414bde64e0d443c9ec922.tar.bz2
Merge branch 'db/remote'
* db/remote: Move refspec pattern matching to match_refs(). Update local tracking refs when pushing Add handlers for fetch-side configuration of remotes. Move refspec parser from connect.c and cache.h to remote.{c,h} Move remote parsing into a library file out of builtin-push.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index fb11fa1..7527734 100644
--- a/Makefile
+++ b/Makefile
@@ -296,7 +296,8 @@ LIB_H = \
diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.h \
run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \
- utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h mailmap.h
+ utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h \
+ mailmap.h remote.h
DIFF_OBJS = \
diff.o diff-lib.o diffcore-break.o diffcore-order.o \
@@ -318,7 +319,7 @@ LIB_OBJS = \
write_or_die.o trace.o list-objects.o grep.o match-trees.o \
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
+ convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o
BUILTIN_OBJS = \
builtin-add.o \