Skip to content

Latest commit

 

History

History
80 lines (60 loc) · 3.06 KB

git.md

File metadata and controls

80 lines (60 loc) · 3.06 KB
Raw

Git Walk-through

Introduction

The first video is "Git in principle", and the second is "Git in practice".

The second video seems to imply that Git is centralized, which is in opposition to the description given in the first video. Centralized version control tools only permit one user to handle a portion of code at a time. Git is a distributed version control tool. Many users can operate on a Git project simultaneously, and the resulting changes are brought together into one place.

Installation

Configuration

The most pertinent information is in the "Git Configuration" section only. Feel free to read further for more details and advanced configuration. The email and username you select will show up in publicly available git commit histories.

Operation

In the Udacity video, four columns are shown. It may help to think of the column on the far left as the newest changes to the code. We make changes to code, then pass those changes through certain steps to ensure the difference the changes make is correct and understandable.

Kev's overview has some caveats. First, when cloning a project, if you have not first setup SSH access to your repository, use HTTPS instead (seen at 6:54). Second, when you see the usage of git checkout as it applies to switching branches, it is preferrable to use the git switch command. So, git checkout -b new-branch should be git switch -c new-branch, and git checkout existing-branch should be git switch existing-branch. The usage of checkout to move to a specific commit (seen at 4:50) is correct. The git command will give notices to use git switch in the relevant cases and those messages can be seen in the video. Lastly, it is currently preferred to use the default branch name "main" rather than "master".

Interpretation

A simple list of commands to start work on an issue:

git switch main
git pull origin main
git switch -c my_branch-123
# make change(s)
git add .
git commit -m"Make specific change"
git push -u origin my_branch-123

Additional commits can be added:

git add .
git commit -m"Fix some mistake"
git push

It may be useful to run git remote prune origin after git pull origin main to ensure that the references to remote branches are cleaned up.

Visualization

Git, as a command line interface (CLI) tool, is easy to interact with for those who are comfortable working from a terminal. However, it can be useful, not just for learners, to have clear visual represenations of the data being operated on. Many graphical user interface (GUI) programs are available that leverage the Git CLI as their "engine".