diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-11 22:33:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-11 22:33:51 -0700 |
| commit | ae90e16a3a7586bc25b7c7de50e4c3ba4806b3b9 (patch) | |
| tree | b868ef92c090819f91ced2de2c179f40030934ae /Makefile | |
| parent | b85997d14d1873a4baa3d04966cd5947e6134acd (diff) | |
| parent | 3000658f7c15c880f976aac0ade73efd3b1e9790 (diff) | |
| download | git-ae90e16a3a7586bc25b7c7de50e4c3ba4806b3b9.tar.gz | |
Merge branch 'js/remote'
* js/remote:
"remote update": print remote name being fetched from
builtin remote rm: remove symbolic refs, too
remote: fix "update [group...]"
remote show: Clean up connection correctly if object fetch wasn't done
builtin-remote: prune remotes correctly that were added with --mirror
Make git-remote a builtin
Test "git remote show" and "git remote prune"
parseopt: add flag to stop on first non option
path-list: add functions to work with unsorted lists
Conflicts:
parse-options.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -247,7 +247,7 @@ SCRIPT_SH = \ SCRIPT_PERL = \ git-add--interactive.perl \ git-archimport.perl git-cvsimport.perl git-relink.perl \ - git-cvsserver.perl git-remote.perl git-cvsexportcommit.perl \ + git-cvsserver.perl git-cvsexportcommit.perl \ git-send-email.perl git-svn.perl SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ @@ -385,6 +385,7 @@ BUILTIN_OBJS = \ builtin-push.o \ builtin-read-tree.o \ builtin-reflog.o \ + builtin-remote.o \ builtin-send-pack.o \ builtin-config.o \ builtin-rerere.o \ |