http://etherboot.org/dokuwiki-2017-02-19b/ 2026-04-17T04:41:37-07:00 http://etherboot.org/dokuwiki-2017-02-19b/ http://etherboot.org/dokuwiki-2017-02-19b/lib/tpl/monobook/images/favicon.ico text/html 2009-06-09T05:58:23-07:00 http://etherboot.org/dokuwiki-2017-02-19b/wiki/user/mdc/notes/git/merging-commits?rev=1244552303&do=diff Merging multiple git commits into a single commit Here is a link to a good article on this: https://cswiki.cs.byu.edu/cs431/index.php/Git_Basics#Flattening_Revision_History The useful part: Flattening Revision History When working on a feature in an existing code base, you'll probably want to commit often to keep track of your progress. However, when you finish your feature and you're ready to send a patch to an upstream repository, you probably won't want to send them all of your revision hi…