From 88fb114a44050b5e837fa9598dbbde80b3bc6a52 Mon Sep 17 00:00:00 2001 From: Nathan Danielsen Date: Wed, 5 Jun 2019 15:06:16 -0700 Subject: [PATCH] more updates --- materials/4-Git-Advanced.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/materials/4-Git-Advanced.md b/materials/4-Git-Advanced.md index e990763..5a11591 100644 --- a/materials/4-Git-Advanced.md +++ b/materials/4-Git-Advanced.md @@ -1,5 +1,7 @@ -# Advanced +# Git Advanced + +Let's dive into some more advanced topics on using git. ## Git Branches @@ -7,8 +9,6 @@ A branch represents a different line or work that is separated from the `main` o In git, we use branches to work in parallel and then merge our code together. - - Check out your current branch for your `ice-cream-shop` project. ``` @@ -48,6 +48,7 @@ hint: `git push ` #### Protip: You can create and checkout a branch in one command. + ``` $ git checkout -b some-branch` ``` @@ -81,6 +82,11 @@ Now that we have added some gelato in a separate branch (body of work) of our co ``` +### Protip + +Install [git-completion](https://github.com/bobthecow/git-flow-completion/wiki/Install-Bash-git-completion) to make using git much easier. + + ### Resources Here are a few other resources that might be helpful for diving deeper into git.