Menu

Git & GitHub Introduction

Chapter 1. Git & GitHub Overview

What Is Git?

What Is Version Control?

How To Save Versions in Git?

Collaborating on Git & GitHub – Remote Repository

Collaborating on Git & Git Hub – Branch

Git & GitHub Basic Life Cycle

Chapter 2. Git & GitHub Initial Settings

Git & GitHub Initial Settings Overview

Key Tool Preparation (1) – Mac

Key Tool Preparation (2) – Windows

Key Tool Preparation (3) – Linux Remote Server

Git User Settings – git config

Create GitHub Account

GitHub Access Authentication Settings

Generating PAT (Personal Access Token)

GitHub SSH Setup

Chapter 3. Git & GitHub Project Setup

Three Cases in Git & GitHub Project Setup

Git & GitHub Project Setup Overview in Different Cases

Building Remote Collaboration Practice Environment

Project Initiator – Key Steps To Launch Git Project

Project Initiator – Create Local Repository (git init)

Project Initiator – Make the First Commit

Project Initiator – .gitignore File

Project Initiator – Create Remote Repository

Project Initiator – Link Between Remote and Local Repositories (git remote add)

Project Initiator – Upload Local Repository to Remote Repository (git push)

Project Initiator – Grant Remote Repository Access to Project Members

Project Member – Start Project As Collaborator

Project Member – Create Copy of Project Code on Local Computer (git clone)

Non-Member – Start Project With Replica of Existing Repository (Fork)

Fork vs. Clone

Chapter 4. Edit & Commit

Git Regular Workflow – Edit & Commit

Edit and Commit Overview (1)

Add Files to Staging Area – git add

Commit Files – git commit

HEAD and INDEX

Check Status of Working Tree and Staging Area – git status

Check Commit Histories – git log

Check Differences – git diff

Restore Files to Working Tree – git restore

Undo Changes – git reset

Delete Files – git rm

Edit and Commit Overview (2)

Chapter 5. Work With Branches

Git Regular Workflow – Work With Branches

What Is Branch?

Branch Operation Basic Life Cycle

Create Branch and Check Branch Status – Git Branch

Switch Current Branch (1) – Git Checkout

Switch Current Branch (2) – Git Switch

Merge Branches – Git Merge

Fast-Forward Merge

Non-Fast-Forward Merge (No Option)

Non-Fast-Forward Merge (--no-ff Option)

Squash Merge

Rebase Branch – Git Rebase

Managing Conflict

Stash Changes – Git Stash

Chapter 6. Remote Collaboration

Git Regular Workflow – Remote Collaboration

Remote Collaboration Overview

Link With Remote Repository – Git Remote

Upload to Remote Repository – Git Push

Download Remote Repository and Merge to Local Repository – Git Pull

Get Remote Repository Information to Local Repository – Git Fetch

Pull vs. Fetch

Request for Review and Merge – Pull Request

Merge Operation Using GitHub

Chapter 7. Supplemental Topics

Git Key Commands and GitHub Key Features

Git & GitHub Glossary

GitHub Other Features

Git & GitHub IntroductionChapter 4. Edit & Commit

Edit and Commit Overview (2)

Preparing for Git Branches in Edit and Commit

To prepare for the next chapter, we introduce another diagram to explain the edit and commit workflow. This illustration will help you understand how Git works with branches, which will be the focus of the next chapter. The following is the explanation of key icons.

working-tree.svg Working Tree or Working Directory, which you see on your local computer for daily editing.

staging-area.svg INDEX or Staging Area. If the Working Tree is inside this dotted circle, the edit status of the working tree and the staging area are the same.

commit.svg Commit. If the Working Tree is inside this bold circle, the edit status of the Working Tree and the commit are the same.

In this diagram, you can see the progress of coding horizontally. If icons are on the same status column (e.g., Status B), the files or directories are in the same status too.

The steps below are the explanation of the diagram in the main figure.

  1. First, the Working Tree and the latest commit are under the same status (Status B in the diagram).
  2. When you edit files under the Working Tree, the Working Tree status changes from Status B to Status C.
  3. By running the git add command, edited files in the Working Tree will be registered in the staging area(INDEX). At this point, both the Working Tree and the staging area are in Status C.
  4. To make a record of one version using the staged files, run the git commit command. The latest commit (HEAD) and the Working Tree become the same status (Status C).
  5. After the commit action, you can continue to edit and move the Working Tree forward to Status D.
  6. However, you may find an error in the committed files. If that is the case, you can restore the files from the latest commit by running the git restore command (the Working Tree will be back to Status C).
  7. If you find another error in a committed file, you can also reverse the committed history by running the git reset --hard command. For this purpose, you need to set a commit hash to specify which commit you want to retrieve.
    • The git reset command can used for clearing the staging area
    • Using different options (--soft or --mixed), you can keep the Working Tree and/or the INDEX status.

Tags:

© 2024 D-Libro. All Rights Reserved