Merge branch 'js/remote'
commitae90e16a3a7586bc25b7c7de50e4c3ba4806b3b9
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Mar 2008 05:33:51 +0000 (11 22:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Mar 2008 05:33:51 +0000 (11 22:33 -0700)
treeb868ef92c090819f91ced2de2c179f40030934ae
parentb85997d14d1873a4baa3d04966cd5947e6134acd
parent3000658f7c15c880f976aac0ade73efd3b1e9790
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
Makefile
contrib/examples/git-remote.perl
parse-options.c
parse-options.h