JumpStart – GIT for collaborations

 

 

gitk to get gui for git

git fetch to local repo

git reset to unadd

git checkout . (undo unwanted changes)

git stash -u (stash untracked files)

git stash pop 1 (stash pop particular stash by number, where 1 is the number)

git pull -r [origin master](rebase: put aside your commit, pull updated repo and you can now push)

git reset HEAD^ (options: HEAD^ [last commit], HEAD~2 [which is last 2 commits], SHA)

git checkout HEAD^ (options: HEAD^ [last commit], HEAD~2 [which is last 2 commits], SHA, which checkouts to a specific point in ‘playground’ mode)

check-in dance:
git pull -r -> git add -p -> git commit -m “msg” -> git pull -r -> run tests -> git push

 

https://martinfowler.com/bliki/FeatureToggle.html

https://continuousdelivery.com/2011/05/make-large-scale-changes-incrementally-with-branch-by-abstraction/

https://www.lean.org/WhatsLean/

feature branch development process:

git pull -r -> git check out -> develop -> git pull -r origin master -> git checkout master -> git merge branch 1 -> git push -> git branch -d <branch name>