This guide is to provide newcomers with a brief set of readings to develop a general understanding of Git and our current Git strategy in place. Thus, by no means is this a comprehensive guide to Git, but a means to be effective when getting started with Git.
This will be our branching strategy, which is widely used among popular GitHub OOS projects. In addition, it's rather simple, yet flexible. Even better, it's pure bliss with continuous delivery and CI.
Once you review the articles above, you'll be wondering how does this fit inline with us? Well, the diagram below provides a sample git history of a project spanning 2 typical sprints.
Diagram of GitHub Flow Revised for IE Sprints
A easy, yet effective practice that everyone should be following, which will make it far easier to comprehend Git histories.
- GitMagic
Automate rule checking, a contribution.json is located within this repo, which falls inline with Chris Beam's article.
Include these alias in your shell's .rc file, and you'll have access to these useful git aliases.
alias gs='git status '
alias ga='git add '
alias gb='git branch '
alias gc='git commit'
alias gp='git pull'
alias gps='git push'
alias gpsu='git push --set-upstream origin'
alias gd='git diff'
alias got='git '
alias get='git '
alias glog='git log --graph --decorate --pretty=oneline --abbrev-commit --all --date=local'This material is not required but is still relevant.
- Git Book
One of the best resources on git. This is a lot of content and not necessary for day-to-day, but you will become very proficient with this material.
