diff --git a/episodes/14-collaboration-using-git.md b/episodes/14-collaboration-using-git.md index 1e6df4dbd..9d3605a87 100644 --- a/episodes/14-collaboration-using-git.md +++ b/episodes/14-collaboration-using-git.md @@ -123,7 +123,10 @@ SVG of the diagram can be downloaded from: https://mermaid.ink/svg/pako:eNqFksFuwyAMhl8FcemmdS_AodKm7rZe2sOkKRcXnAQNcEaMpqjquw-SZZtUReEE9vfbP5iL1GRQKtnjZ8KgcW-hieCrIPJ6o_hhQyP2NqJmisPjbvdwYmhK8CkiKNFYFmDMxP9PFfSVNDhxxI56W-TiOULQ7aTS5L3lSbgAlhpH9MS4VKRLfTuVWOJWfdTIul21cfMUqmg9xgbX-9-Kf8w7J-76liLrlI1Q_DOUT87RFxpxHsRvq5EBseEIeqx4Hnts7uVWZsCDNXmWl-Koktyix0qqvDVYQ3JcySpcMwqJ6TQELRXHhFuZOgM8j16qGlyfo2jKPQ7T_xi_yUy-jJlZ3UF4J5p112_HVM9r --> -{alt='Development lifecycle with Git, containing Git commands add, commit, push, fetch, restore, merge and pull' .image-with-shadow width="600px"} +{ + alt='Development lifecycle with Git. Four parts of Git infrastructure are represented: working tree, staging area, local repository and remote repository, and alongside this various git commands. git add is shown moving files from working tree to staging area. git commit is shown moving files from staging area to local repository. git push is shown moving files from local repository to remote repository and git fetch from remote repository to local repository. git checkout and git merge are both shown as moving files from local repository to working tree. git pull, a shortcut for git fetch followed by git checkout / merge, is shown moving files from remote repository to working tree.' + .image-with-shadow width="600px" +} ## Checking-in Changes to Our Project @@ -306,7 +309,7 @@ Collaborating with others involves managing these remote repositories and pushing and pulling information to and from them when you need to share work. -{alt='git-distributed' .image-with-shadow width="400px"} +{alt='Representation of Git\'s distributed version control system showing interactions between a central repository and two local repositories on developer machines, with arrows showing pushing from central repository to developer repositories, pulling from developer repositories to central repository. A self-connecting arrow on developer repository shows creating commits in local repository.' .image-with-shadow width="400px"}
Git - distributed version control system
From W3Docs (freely available)
Git feature branches
Adapted from Git Tutorial by sillevl (Creative Commons Attribution 4.0 International License)