diff --git a/README.md b/README.md index c4497ea..0d73863 100644 --- a/README.md +++ b/README.md @@ -118,20 +118,22 @@ Check the logs ## Using the terminal -### Getting started -Set up your git info +### Configure tooling +Configure user information for all local repositories + +`$ git config --global user.name "[name]"` + +Sets the name you want attached to your commit transactions + +`$ git config --global user.email "[email address]"` + +Sets the email you want attached to your commit transactions + +`$ git config --global color.ui auto` + +Enables helpful colorization of command line output ```shell -*** Please tell me who you are. - -Run - - git config --global user.email "you@example.com" - git config --global user.name "Your Name" - -to set your account's default identity. -Omit --global to set the identity only in this repository. -``` If you want to save your https credentials run ```shell @@ -162,16 +164,29 @@ unstage by using use "git reset HEAD ..." to unstage ``` -Creating a new branch -```shell -git branch -git checkout -b -``` -Going to different branch -```shell -git checkout -``` +### Branches + +Branches are an important part of working with Git. +Any commits you make will be made on the branch you’re currently “checked out” to. +Use git status to see which branch that is. + +Creates a new branch +`$ git branch [branch-name] +git checkout -b +` + +Switches to the specified branch and updates the working directory +`$ git checkout [branch-name]` + + +Combines the specified branch’s history into the current branch. This is usually done in pull requests, but is an important Git operation. +` $ git merge [branch] ` + + +Deletes the specified branch +` $ git branch -d [branch-name] ` + Seeing available branches ```shell