Version Control and How it Can Save Your Life @Rachell_Calhoun Git in Control DjangoCon US 2016 

Git in Control 1. $whoami 2. Version control 3. Setting up Git 4. Basic Commands 5. Tricky Stuff 6. Gitiquette 

$whoami git config -- global user.name "Rachell Calhoun" Git config $whoami 

Rachell ( yes, with 2 Ls) 

Git in Control 1. $whoami 2. Version control 3. Setting up Git 4. Basic Commands 5. Tricky Stuff 6. Gitiquette 

Version control? 

Solo Projects 

Collaborating 

Git in Control 1. $whoami 2. Version control 3. Setting up Git 4. Basic Commands 5. Tricky Stuff 6. Gitiquette 

git config --global user.name "Jane Doe" git config --global user.email [email protected] 

$ git init $ git remote add origin path/to/origin 

$git clone path/to/remote/repo 

Workflow Init/Clone 

Git in Control 1. $whoami 2. Version control 3. Setting up Git 4. Basic Commands 5. Tricky Stuff 6. Gitiquette 

$ git status 

$ git status On branch branchname Untracked files: (use "git add ..." to include in what will be committed) list_of_passwords passwords2 nothing added to commit but untracked files present (use "git add" to track) 

$ git add path/to/filename 

$ git add filename 

$ git add --all 

Workflow Init/Clone > Add 

$ git commit 

$ git commit -m “...” git commit -m ”I made some awesome changes”. 

Workflow Init/Clone > Add > Commit C1 

$ git push 

$ git push $ git push origin master $ git push origin branchname 

Sum it up Init/Clone > Add > Commit > Push C1 C1 

Branches 

Branches Master work-branch party-branch P1 P2 W1 W2 

$ git checkout -b work-branch Master work-branch 

$ git branch -d work-branch Master 

$ git push origin work-branch Origin work-branch W1 W2 Push Master work-branch 

$ git branch master work-branch * party-branch 

No content

$ git fetch origin 

$ git merge work-branch Master work-branch party-branch P1 P2 W1 W2 W1 W2 P1 P2 

Conflicts 

git pull = fetch + merge 

Forking 

Pull Request 

Celebrate! 

$ git remote add upstream path/to/original/repo 

$ git pull upstream master 

Git in Control 1. $whoami 2. Version control 3. Setting up Git 4. Basic Commands 5. Tricky Stuff 6. Gitiquette 

Tricky stuff 

$ git stash 

$ git stash -u 

Stash $ git stash apply $ git stash drop $ git stash pop 

$ git stash branch party-branch 

Undo Local Commits 

Undo local commits $ git reset HEAD~2 $ git reset --hard HEAD~2 $ git reset --hard 234jk3 

$ git rm list_of_passwords Removing files 

Removing (added) files $ git reset list_of_passwords $ echo list_of_passwords >> .gitignore 

No content

No content

Edit a Commit Message $ git commit --amend $ git commit --amend -m "New message that sounds like I know what I’m doing!" 

Add a Forgotten File $ git add forgotten_file $ git commit --amend $ git diff --stat --cached origin/master 

Git in Control 1. $whoami 2. Version control 3. Setting up Git 4. Basic Commands 5. Tricky Stuff 6. Gitiquette 

Gidiquette - Check issues - Branch naming - Keep changes small - Respect the coding style - Play nice with others 

To Summarize: git config --global user.name git config --global user.email git init git remote add origin git clone git status git add git commit -m “...” git push git checkout -b branchname git branch -d branchname git push origin branchname git branch git fetch origin git merge branchname git pull Forking Compare and Pull Request git remote add upstream path/to/rep Git pull upstream master git stash git stash -u git stash apply git stash drop git stash pop git stash branch branchname git reset HEAD~2 git reset --hard HEAD~2 git reset --hard 234jk3 git rm list_of_passwords git reset list_of_passwords git commit --amend -m “...” git add forgotten_file git diff --stat --cached origin/master 

Thank You! @Rachell_Calhoun