Uemis Patches

[Dirk Hohndel]

On Thu, Sep 10, 2015 at 10:50:31PM +0200, Guido Lerch wrote:
> Thanks Dirk,
> 
> I have a at least one more code optimisation. How would I get the last
> master and merge my commits that
> I have not formatted to patches. I was reading the documentation about
> merge vs. rebase and frankly I don't
> get it at this point in time.

So merge and rebase are kinda similar, but they use different strategies.
Rebase tries to take all the commits you have in your current tree and
apply them on top of whatever branch you are rebasing onto.

So typically you'd do

git checkout devel
git checkout -b testmerge
git fetch
git rebase -i master

See how well this works. If it does

git branch -D devel
git branch -m testmerge devel

which deletes the old devel branch and renames the freshly rebased branch
as your new devel branch.

/D