At the university where I work, we use an open source learning management system (Moodle). Over time, we've edited the source code directly to fix bugs we've found and provide custom functionality. I'd like to be able to keep up with the bug fixes via a Git repository while also keeping track of our changes and making sure that our edits are preserved.
I'm a relative Git newbie, but from what I can tell here is our current situation.
--C----C----C----C----C < custom / ---B-----F-----F-----F-----F-----F-----F--... < origin B = the build we installed C = our changes F = bug fixes
My question, to make it short, is how to combine the C's and F's together. Merging? Rebasing? Which tree should I merge/rebase into the other?