summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-17 17:57:33 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-17 17:57:33 -0700
commit210a0be504829bad5a2821488d3c25cc406fed4a (patch)
treef1cb488ae79d4e871275d7216f01bc54fd4a1bc0 /git-merge-octopus.sh
parentMerge branch 'jc/rw-prefix' (diff)
parentfetch-pack: give up after getting too many "ack continue" (diff)
downloadtgif-210a0be504829bad5a2821488d3c25cc406fed4a.tar.xz
Merge early part of branch 'jc/fetchupload'
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions