Hacker News new | ask | show | jobs
by maryrosecook 4159 days ago
I wrote a short post about how and why I made Gitlet: http://maryrosecook.com/blog/post/introducing-gitlet
3 comments

Keep making cool stuff. Loved your little lisp project!
It's pretty awesome of you to provide the annotated source code for Gitlet! :D
I can't seem to find the rebase code? I've always wondered how that part works. Great work otherwise! I've already taken a look at the three way merger code.
In a nutshell, it checks out the target and cherry-picks what had been HEAD onto it, beginning at the merge-base.

https://github.com/libgit2/libgit2/blob/master/src/rebase.c may be helpful and (hopefully) readable.