Weekly Share -- Rediscovering Git

Nov 6, 2019#基础59

AI Translation

This post is translated from Chinese into English through AI.View Original

AI-generated summary

Title: Weekly Sharing - Rediscovering Git Date: November 7, 2019 Tags: Basics Categories: Learning Notes Thumbnail: ![Image](https://img.5bang.top/slab_is_live.jpg) This week, I chose to share insights on Git due to some recent challenges I faced while using it, as well as my desire to clarify foundational concepts. **Git Concepts:** - **Workspace:** Current development area. - **git pull:** Fetches and merges the latest code from the remote repository. - **git diff:** Shows modified but unstaged files. - **Index:** Staging area. - **git add:** Stages changes from the workspace. - **Repository:** Local repository. - **git commit:** Commits staged changes to the local repository. - **git fetch/git clone:** Retrieves/clones code from the remote repository. - **Remote Repository:** The online repository. - **git push:** Pushes local repository changes to the remote repository. **Common Questions:** - **What does `git push origin master` do?** It pushes the local master branch to the origin and creates a corresponding branch there. - **Difference between `git merge` and `git rebase`:** Illustrated with examples of merging the test branch into master. **Recent Issues:** - To revert to a previous version due to local project errors, use `git reset --hard/soft [commit]`. - To undo a pushed commit, reset the remote repository with `git reset --hard [commit]` followed by `git push origin HEAD --force`. Further resources include visual guides on Git and branching strategies.

This week it’s my turn to share some technical insights. After much consideration, I decided to choose Git as the theme for this week's technical sharing. There are two reasons: first, I've encountered some difficulties while using Git recently, which will be mentioned later. Second, even though I use Git every day, there are still some basic concepts that I find unclear, and I hope to further understand Git through this sharing.

Principles of Git#

git

workspace: Working directory (current development location)

git pull: Pull the latest code from the remote repository to the working directory => git fetch + git merge
git diff: View modified but unstaged files

index: Staging area

git add: Submit changes from the working directory to the staging area

repository: Local repository

git commit: Submit the contents of the staging area to the local repository
git fetch or git clone: Pull/clone code from the remote repository to the local repository

remote repository: Remote repository

git push: Submit the contents of the local repository to the remote repository

Common Questions#

What exactly does git push origin master do?

It pushes the contents of the local master branch to origin, creating a branch named master at origin.
Full command: git push origin master:master => git push <remote hostname> <local branch name>:<remote branch name>

The difference between git merge and git rebase

Example: Merging the test branch into the master branch

git-test

Result of git merge

git-merge

Result of git rebase

git-rebase

Online Demo

Recent Issues Encountered#

Local project runs into errors, want to revert to a previous version => Revert the local repository to a previous version

git reset --hard/soft [commit point to revert to]

Undo a commit that has already been pushed to the repository => Revert the remote repository to a previous version

git reset --hard [commit point to revert to]
git push origin HEAD --force

不求谌解