diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-12-08 11:24:14 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-12-08 11:24:14 -0800 |
commit | 3d90c796503efa3ca9812575a41cb8b019d27218 (patch) | |
tree | 4ae0649bc4bf21c371b78669fb946a084a27225b /Makefile | |
parent | 23778ae9a08e9324f03898760b9e20b6b2dd6e23 (diff) | |
parent | 7851b1e60fabe350216d48e6de03a3ed21a49953 (diff) | |
download | git-3d90c796503efa3ca9812575a41cb8b019d27218.tar.gz git-3d90c796503efa3ca9812575a41cb8b019d27218.tar.xz |
Merge branch 'il/remote-fd-ext'
* il/remote-fd-ext:
remote-fd/ext: finishing touches after code review
git-remote-ext
git-remote-fd
Add bidirectional_transfer_loop()
Conflicts:
compat/mingw.h
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -739,6 +739,8 @@ BUILTIN_OBJS += builtin/read-tree.o BUILTIN_OBJS += builtin/receive-pack.o BUILTIN_OBJS += builtin/reflog.o BUILTIN_OBJS += builtin/remote.o +BUILTIN_OBJS += builtin/remote-ext.o +BUILTIN_OBJS += builtin/remote-fd.o BUILTIN_OBJS += builtin/replace.o BUILTIN_OBJS += builtin/rerere.o BUILTIN_OBJS += builtin/reset.o |