summaryrefslogtreecommitdiff
path: root/t/t5515/refs.master_branches-default
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-27 14:29:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-27 14:29:52 -0700
commit833cd7fc9fed8568a3612e9b1b204290b0f0e15d (patch)
treeca145ec8b6e1b0376504a4faa8f6f2bafdfcedeb /t/t5515/refs.master_branches-default
parentMerge branch 'bc/http-keep-memory-given-to-curl' (diff)
parentpull: merge into unborn by fast-forwarding from empty tree (diff)
downloadtgif-833cd7fc9fed8568a3612e9b1b204290b0f0e15d.tar.xz
Merge branch 'jk/pull-into-dirty-unborn'
"git pull" into nothing trashed "local changes" that were in the index, and this avoids it. * jk/pull-into-dirty-unborn: pull: merge into unborn by fast-forwarding from empty tree pull: update unborn branch tip after index
Diffstat (limited to 't/t5515/refs.master_branches-default')
0 files changed, 0 insertions, 0 deletions