summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.master_branches-default
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-19 20:37:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-19 20:37:21 -0700
commit61d7503da141f13bc916b36012760791761cc909 (patch)
tree2b1cff95e16f2ed1543e4790d682e2e4996e92b7 /t/t5515/fetch.master_branches-default
parentMerge branch 'nd/sparse-co-fix' (diff)
parentread_sha1_file(): allow selective bypassing of replacement mechanism (diff)
downloadtgif-61d7503da141f13bc916b36012760791761cc909.tar.xz
Merge branch 'jc/replacing'
* jc/replacing: read_sha1_file(): allow selective bypassing of replacement mechanism inline lookup_replace_object() calls read_sha1_file(): get rid of read_sha1_file_repl() madness t6050: make sure we test not just commit replacement Declare lookup_replace_object() in cache.h, not in commit.h Conflicts: environment.c
Diffstat (limited to 't/t5515/fetch.master_branches-default')
0 files changed, 0 insertions, 0 deletions