diff --git a/episodes/14-collaboration-using-git.md b/episodes/14-collaboration-using-git.md index fe5c92f92..c1720744f 100644 --- a/episodes/14-collaboration-using-git.md +++ b/episodes/14-collaboration-using-git.md @@ -67,26 +67,26 @@ The diagram below shows a typical software development lifecycle with Git (in our case starting from making changes in a local branch that "tracks" a remote branch) and the commonly used commands to interact with different parts of the Git infrastructure, including: -- **working directory** - +- **working tree** - a local directory (including any subdirectories) where your project files live and where you are currently working. - It is also known as the "untracked" area of Git. - Any changes to files will be marked by Git in the working directory. - If you make changes to the working directory and do not explicitly tell Git to save them - + It is also known as the "untracked" area of Git or "working directory". + Any changes to files will be marked by Git in the working tree. + If you make changes to the working tree and do not explicitly tell Git to save them - you will likely lose those changes. Using `git add filename` command, - you tell Git to start tracking changes to file `filename` within your working directory. + you tell Git to start tracking changes to file `filename` within your working tree. - **staging area (index)** - once you tell Git to start tracking changes to files (with `git add filename` command), Git saves those changes in the staging area on your local machine. Each subsequent change to the same file needs to be followed by another `git add filename` command to tell Git to update it in the staging area. - To see what is in your working directory and staging area at any moment + To see what is in your working tree and staging area at any moment (i.e. what changes is Git tracking), run the command `git status`. - **local repository** - - stored within the `.git` directory of your project locally, + stored within the `.git` working tree of your project locally, this is where Git wraps together all your changes from the staging area and puts them using the `git commit` command. Each commit is a new, permanent snapshot (checkpoint, record) of your project in time, @@ -106,14 +106,16 @@ with different parts of the Git infrastructure, including: is to always do a `git pull` before a `git push`, to ensure you have any latest changes before you push your own.