aboutsummaryrefslogtreecommitdiffstats
path: root/commit-slab.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-08 15:59:33 +0900
committerJunio C Hamano <gitster@pobox.com>2018-05-08 15:59:33 +0900
commitad3207e6ff019060e4f634a5455aa0ae248e3a7a (patch)
tree8a5d3a7ffb087a491ecb6d4db68078144e4df495 /commit-slab.h
parentMerge branch 'tz/doc-git-urls-reference' (diff)
parentfast-export: fix regression skipping some merge-commits (diff)
downloadgit-ad3207e6ff019060e4f634a5455aa0ae248e3a7a.tar.gz
git-ad3207e6ff019060e4f634a5455aa0ae248e3a7a.zip
Merge branch 'ma/fast-export-skip-merge-fix'
"git fast-export" had a regression in v2.15.0 era where it skipped some merge commits in certain cases, which has been corrected. * ma/fast-export-skip-merge-fix: fast-export: fix regression skipping some merge-commits
Diffstat (limited to 'commit-slab.h')
0 files changed, 0 insertions, 0 deletions