On 2015-03-09 at 16:47:27 -0500, Zakariyya Mughal wrote: > There is also a way to enforce that master does not use merge commits > using a server-side Git hook from Nestoria (a Perl shop!) > <http://devblog.nestoria.com/post/98892582763/maintaining-a-consistent-linear-history-for-git>.
Sorry, Ed just mentioned in IRC that this hook will only prevent some merge commits, not all. Regards, - Zaki Mughal > > Regards, > - Zaki Mughal > > On 2015-03-09 at 15:41:18 -0500, Zakariyya Mughal wrote: > > Hello all, > > > > I wanted to write out a short explanation of rebasing feature branches. > > Many projects prefer to use git rebasing when incorporating changes from > > branches because it helps keep history easy to read (i.e., linear). > > > > I have a feature branch that fixes the bug [SF#332 "isn't numeric in > > null operation" warning could be more helpful]. This is on the branch > > `pdl-eq-with-string-warning` <https://github.com/PDLPorters/pdl/pull/63>. > > Currently, the branch is 1 commit ahead and 2 commits behind master. > > This means that using `git merge --no-ff pdl-eq-with-string-warning` > > to merge into the master branch will not work. > > > > The following commands can be used to perform --no-ff merge in this > > situation. > > > > git fetch origin # get all branches > > > > git checkout pdl-eq-with-string-warning # switch to the > > pdl-eq-with-string-warning branch > > > > git rebase origin/master # put all commits of > > pdl-eq-with-string-warning on top of the current master commits > > > > git checkout master # switch back to the master > > branch > > > > git merge --no-ff pdl-eq-with-string-warning # merge feature branch into > > the master branch > > > > git push origin master # push the changes back to > > SourceForge > > > > > > For a description of merging versus rebasing, this page has examples > > with diagrams > > <https://www.atlassian.com/git/tutorials/merging-vs-rebasing/workflow-walkthrough>. > > > > Regards, > > - Zaki Mughal ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ pdl-devel mailing list pdl-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/pdl-devel
