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 /merge-tree.c | |
| parent | Merge branch 'lt/unpack-trees' (diff) | |
| parent | "remote update": print remote name being fetched from (diff) | |
| download | tgif-ae90e16a3a7586bc25b7c7de50e4c3ba4806b3b9.tar.xz | |
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 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions