I was wondering .. how (if there is a way) I can merge the latest
current Suricata dev git master and a git pull request that has not yet been
introduced into the git master?
I want to git clone the latest Suricata git master... and then apply to it
Tom Decanio's github branch for ALL JSON output -
(git clone https://github.com/decanio/
What is the best way to do that?
well (with some invaluable help from Regit):
git clone git://phalanx.
git remote add decanio https://github.com/decanio/
git fetch decanio
git checkout -b my-dev-np-work1.3 decanio/dev-np-work1.3
git fetch origin
git rebase origin/master
you're done (if there are no errors during the re-basing phase :) ) !