Git workflow

[Olav Vitters]

Hi,

Is there any recommended workflow people are using in the following
situation:
- be able to commit changes in a self hosted Bugzilla repository
- use that self hosted Bugzilla repository for own installation (easy)
- be able to merge changes from git.mozilla.org
- be able to move from 4.2 branch to 4.4 branch, etc
- be able to see the difference between local and "pristine upstream"
- how to set all of this up initially?

Any recommended workflow to follow?

I'm pretty much an idiot with git. I've found various guides, just
wondering what people use in practice.

e.g.
http://joshbranchaud.com/blog/2014/01/17/Updating-Forked-Git-Repository-With-Latest-Upstream-Changes.html

Is that what people do? How do you set up the initial fork?

-- 
Regards,
Olav