dhis2-documenters team mailing list archive

[Jason Pickering <jason.p.pickering@xxxxxxxxx>]

We have a lot of messages like Merge branch 'master' into docinprogress
<https://github.com/dhis2/dhis2-docs/commit/72a344afb7fb243ac4027dc48e2fa87eca533e62>

in the commit history. These are a bit annoying, since they don't really
add much to the revision history.

Here is an article about how you can avoid this.

http://kernowsoul.com/blog/2012/06/20/4-ways-to-avoid-merge-commits-in-git/

Basically, this explains how to use the "rebase" command of git, which will
rewind your changes to the current tip of master, and the replay them on
top of the master branch. This will help to keep the revision history
cleaner.

Regards,
Jason


-- 
Jason P. Pickering
email: jason.p.pickering@xxxxxxxxx
tel:+46764147049