Git Reference
gitref.org
gitref.org
But then I can sympathize that it might be a difficult thing to explain without illustration.
i will add more sections to the site - probably including a workflow section that goes over rebase vs merge workflows.
[1][http://betterexplained.com/articles/aha-moments-when-learnin...]
Another invaluable resource, at least for me, for learning git has been Pro Git[1]. Absolutey wonderful way to learn git even with no background in version control.
Edit: Just to be clear, as a technical user, I love git.
non-techies also have a need for version control. They just don't have access to it.
If I had said, "I want rsync for non-technical users" a couple years back, I'm saying I wish there was something like Dropbox. You might have said "rsync isn't for non-technical users", which is besides the point.