2021-11-19東X米筆記

Git操作演練

https://www.bilibili.com/video/BV1p7411d7Fv/?spmidfrom=333.788.recommendmorevideo.6

https://www.bilibili.com/video/BV1p7411d7Fv?p=1&t=187.3

git rebase

提交記錄的合併尚未提交到遠程倉庫之前
合併2個Branch
中間如果有衝突》中斷》》Merge》》git rebase —continue

git pull=get fetch + git merge

git fetch+git rebase 可以避免分叉

git log --graph pretty.... Notion – The all-in-one workspace for your notes, tasks, wikis, and databases. Sourcetree | Free Git GUI for Mac and Windows 这才是真正的Git——Git实用技巧

git fetch

【初心者向け】git fetch、git merge、git pullの違いについて - Qiita

git tag

git tagの使い方まとめ - Qiita

不經過PUSH的話，TAG不會被上傳到遠方。 tagは作成しただけではリモートには反映されないのでpushしてやる必要がある。

git flow

Git-flowをざっと整理してみた | DevelopersIO

[core]
	repositoryformatversion = 0
	filemode = false
	bare = false
	logallrefupdates = true
	symlinks = false
	ignorecase = true
[user]
	name = a
	email = [email protected]
[remote "origin"]
	url = C:/work/tmp/gittest/remote
	fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
	remote = origin
	merge = refs/heads/master
[branch "newbranch111"]
	remote = origin
	merge = refs/heads/newbranch111
[branch "feature/ftest1"]
	remote = origin
	merge = refs/heads/feature/ftest1