Re: [Pdl-devel] Feature branch rebasing

2015-03-09 Thread Zakariyya Mughal
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!) > . Sorry, Ed j

Re: [Pdl-devel] Feature branch rebasing

2015-03-09 Thread Zakariyya Mughal
Just for reference, the following git settings might be helpful: git config --global --bool pull.rebase true git config --global merge.ff only 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!)

[Pdl-devel] Feature branch rebasing

2015-03-09 Thread Zakariyya Mughal
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