summaryrefslogtreecommitdiff
path: root/t/t0024-crlf-archive.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-29 11:18:31 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-29 11:18:31 -0800
commitda2987d4c3be50bb9d888d145ba42fe26c7045f3 (patch)
treef1385e81d0123482445f5f59ae498b703f253215 /t/t0024-crlf-archive.sh
parentREADME: update stale and/or incorrect information (diff)
parentrebase --preserve-merges: keep all merge commits including empty ones (diff)
downloadtgif-da2987d4c3be50bb9d888d145ba42fe26c7045f3.tar.xz
Merge branch 'ph/rebase-preserve-all-merges' into maint
"git rebase --preserve-merges" lost empty merges in recent versions of Git. * ph/rebase-preserve-all-merges: rebase --preserve-merges: keep all merge commits including empty ones
Diffstat (limited to 't/t0024-crlf-archive.sh')
0 files changed, 0 insertions, 0 deletions