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) |
* 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
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
1 | 2 | |||
---|---|---|---|---|
builtin/fetch.c | patch | | diff1 | | diff2 | | blob | history |
builtin/remote.c | patch | | diff1 | | diff2 | | blob | history |
remote.c | patch | | diff1 | | diff2 | | blob | history |
remote.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/remote.c
Simple merge
diff --cc remote.c
Simple merge
diff --cc remote.h
Simple merge