Git Better

Mozu Workflow

Draw basic release structure
Demo 1.19, 1.20, and 2.0 on top of master
Demo Hotfixes

Definition of master

Stable, next minor release in line for production

Basic Terms

When to do things

When to rebase

When in feature branches
Single commits on release branches

When NOT to rebase

When merging a release branch into master

Basic Setup

Ensure git CLI is working and added to PATH
Install Git windows credential store
Install Sublime Text 3
Learn about %UserProfile%\.gitconfig and link sample

Recommended Tools

ConEmu for Windows - Better shell manager
SourceTree for Windows and Mac - The UI most are using

Recommended Globals

git config --global alias.lgp "log --color --graph --pretty=format:'%C(bold)%h%C(reset) -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold)<%an>%Creset' --abbrev-commit"
git config --global push.default simple
git config --global pull.default simple
git config --global core.autocrlf true

VisualStudio as merge tool

[diff]
    tool = vsdiffmerge
[difftool]
      prompt = false
[difftool "vsdiffmerge"]
      cmd = '"C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\vsdiffmerge.exe"' "$LOCAL" "$REMOTE" //t
      keepbackup = false
      trustexitcode = true
[merge]
      tool = vsdiffmerge
[mergetool]
      prompt = false
[mergetool "vsdiffmerge"]
      cmd = '"C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\vsdiffmerge.exe"' "$REMOTE" "$LOCAL" "$BASE" "$MERGED" //m
      keepbackup = false
      trustexitcode = true

Basic Scenario (local only)

in master, create 1.17 -b flag means create new branch

git checkout -b 1.17

push 1.17 to origin -u means set up stream origin is tfs remote

git push -u 1.17 origin/1.17

create feature branch create local feature branch/topic branch -- not in remote

git checkout -b feature_branch

finished feature branch, wants to merge shouldnt merge! should rebase!

1. git checkout 1.17
2. git pull
3. git checkout feature_branch
4. git rebase 1.17
5. git checkout 1.17
6. git merge --squash feature_branch
7. git commit -m 'add valuble message and bug/feature number'

ToDos

How to howfix
How to create a branch from tag
How to reset and fix issues
How to show what a commit did (CLI and TFS)

greg-murray-volusion / mozu-git-training