aboutsummaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-03 12:38:18 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-03 12:38:18 -0700
commit400ecca8c10520ced800b4fcdd5bdeb94bd2a556 (patch)
tree7481b93198f9d9ac749f55b104a87e5f44ae4d65 /dir.c
parentb407d40933f9c37af16ca3dc275e615ab4fdd8c5 (diff)
parente6f637122ecd60c59df27b8188b6ddac39ac0063 (diff)
downloadgit-400ecca8c10520ced800b4fcdd5bdeb94bd2a556.tar.gz
git-400ecca8c10520ced800b4fcdd5bdeb94bd2a556.tar.xz
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 'dir.c')
0 files changed, 0 insertions, 0 deletions