From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Mar 2008 05:33:51 +0000 (-0700)
Subject: Merge branch 'js/remote'
X-Git-Tag: v1.5.5-rc0~24
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ae90e16a3a7586bc25b7c7de50e4c3ba4806b3b9?hp=ae90e16a3a7586bc25b7c7de50e4c3ba4806b3b9

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
---