diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-03 12:38:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-03 12:38:18 -0700 |
| commit | 400ecca8c10520ced800b4fcdd5bdeb94bd2a556 (patch) | |
| tree | 7481b93198f9d9ac749f55b104a87e5f44ae4d65 /diff-lib.c | |
| parent | Merge branch 'nd/log-show-linear-break' (diff) | |
| parent | fetch: handle overlaping refspecs on --prune (diff) | |
| download | git-400ecca8c10520ced800b4fcdd5bdeb94bd2a556.tar.gz git-400ecca8c10520ced800b4fcdd5bdeb94bd2a556.zip | |
Merge branch 'cn/fetch-prune-overlapping-destination'
Protect refs in a hierarchy that can come from more than one remote
hierarcies from incorrect removal by "git fetch --prune".
* cn/fetch-prune-overlapping-destination:
fetch: handle overlaping refspecs on --prune
fetch: add a failing test for prunning with overlapping refspecs
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions