![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Oct 2011 23:16:29 +0000 (16:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Oct 2011 23:16:29 +0000 (16:16 -0700) | ||
| commit | 9c0c09f791b1bfd2a04aa0e48190d304627293d2 | |
| tree | ad77947d4cfb61a39048f3d9791282ddee377e5f | tree | snapshot |
| parent | f384a2edd62dfc4af0f051dc8248506cebb265f9 | commit | diff |
| parent | e8c1e6c796c1b96b6b208bbd4bc8cfd9acb481b5 | commit | diff |
Merge branch 'cn/fetch-prune'
* cn/fetch-prune:
fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
fetch: honor the user-provided refspecs when pruning refs
remote: separate out the remote_find_tracking logic into query_refspecs
t5510: add tests for fetch --prune
fetch: free all the additional refspecs
Conflicts:
remote.c
* cn/fetch-prune:
fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
fetch: honor the user-provided refspecs when pruning refs
remote: separate out the remote_find_tracking logic into query_refspecs
t5510: add tests for fetch --prune
fetch: free all the additional refspecs
Conflicts:
remote.c
| builtin/fetch.c | diff1 | | diff2 | | blob | history |
| builtin/remote.c | diff1 | | diff2 | | blob | history |
| remote.c | diff1 | | diff2 | | blob | history |
| remote.h | diff1 | | diff2 | | blob | history |