aboutsummaryrefslogtreecommitdiffstats
path: root/pseudo-merge.h
AgeCommit message (Expand)AuthorFilesLines
6 hoursMerge branch 'tb/pseudo-merge-reachability-bitmap' into seenJunio C Hamano1-0/+216
4 dayspseudo-merge: implement support for finding existing mergesTaylor Blau1-0/+7
4 dayspseudo-merge: implement support for reading pseudo-merge commitsTaylor Blau1-0/+44
4 dayspseudo-merge: scaffolding for readsTaylor Blau1-0/+65
4 dayspseudo-merge: implement support for selecting pseudo-merge commitsTaylor Blau1-0/+94
4 dayspseudo-merge.ch: initial commitTaylor Blau1-0/+6