diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:16:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:16:29 -0700 |
| commit | 9c0c09f791b1bfd2a04aa0e48190d304627293d2 (patch) | |
| tree | ad77947d4cfb61a39048f3d9791282ddee377e5f /builtin/rerere.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | fetch: treat --tags like refs/tags/*:refs/tags/* when pruning (diff) | |
| download | tgif-9c0c09f791b1bfd2a04aa0e48190d304627293d2.tar.xz | |
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
Diffstat (limited to 'builtin/rerere.c')
0 files changed, 0 insertions, 0 deletions