My Git Learning Journey

Lessons and answers from the git game

…I skipped many earlier levels… I’ll fill them in later (crawling away)

Remote

Level 11: git remote tracking

We need to make our newly created branch side track origin/master. The consequence is that the local master, which should have tracked origin/master, no longer tracks it — of course, that’s not a bad thing…

After setting the tracking, pull down origin/master and rebase (we can edit conflicting content in the middle), then push it up and we’re done!

git branch -u o/master side
git pull --rebase
git push

Level 12:

What I learned:

git push origin master adds the commits that the local master has but the remote master lacks, syncing master and origin/master.
When HEAD is not pointing to a branch, a plain git push will fail. In that case we need git push origin master. In this scenario we should consider whether to git checkout some branch or run git pull first.

git push origin foo

Level 13:

git push origin foo^:master can upload the commit before foo to the remote master; origin/master will then point to foo^.

git push origin origin master:newBranch can push master to the remote newBranch (a local o/newBranch will appear) even if newBranch doesn’t exist.

git push origin master^:foo

git push origin foo:master

Level 14:

git fetch downloads remote origin/xxx into local orgin/xxx so we can inspect the remote branch first and then merge.

git fetch is more like the opposite of git push.

The requirement is: download the commit before remote master into local foo, download remote foo into local master, then merge local foo and master. Just look at the answer.

git fetch origin master^:foo
git fetch origin foo:master
git checkout foo
git merge master

Level 15:

git push origin :foo

Pushing empty deletes the remote branch foo… how weird.

git fetch orgin :bar

Fetching empty creates a local branch bar… uhh…

Level 16:

git pull origin foo is equivalent to:

git fetch origin foo; git merge o/foo

git pull origin bar~1:bugFix is equivalent to:

git fetch origin bar~1:bugFix; git merge bugFix

pull = fetch + merge

If the current local branch is bar:

git pull origin master:foo

It first creates a local branch named foo, downloads commits from the remote master branch, merges them into foo, and then merges foo into our currently checked-out branch bar.

When we use fetch to download from remote, if the specified local branch doesn’t exist, a new local branch will be created pointing to what we downloaded.

If we just fetch, the result is that we download o/master and o/bar locally (which is of course a benefit).

git checkout c1
git fetch origin master:side
git fetch origin bar:foo
git checkout master
git merge foo
git merge side

Things to keep in mind with git

Lessons and answers from the it game …skipped many earlier levels Three ways to roll back in git:

git clean deletes untracked files, i.e. files newly created this time that weren’t in the last commit.

Lessons and answers from the git game

…I skipped many earlier levels… I’ll fill them in later (crawling away)

Remote

Level 11: git remote tracking

After setting the tracking, pull down origin/master and rebase (we can edit conflicting content in the middle), then push it up and we’re done!

git branch -u o/master side
git pull --rebase
git push

Level 12:

What I learned:

git push origin master adds the commits that the local master has but the remote master lacks, syncing master and origin/master.
When HEAD is not pointing to a branch, a plain git push will fail. In that case we need git push origin master. In this scenario we should consider whether to git checkout some branch or run git pull first.

git push origin foo

Level 13:

git push origin foo^:master can upload the commit before foo to the remote master; origin/master will then point to foo^.

git push origin origin master:newBranch can push master to the remote newBranch (a local o/newBranch will appear) even if newBranch doesn’t exist.

git push origin master^:foo

git push origin foo:master

Level 14:

git fetch downloads remote origin/xxx into local orgin/xxx so we can inspect the remote branch first and then merge.

git fetch is more like the opposite of git push.

The requirement is: download the commit before remote master into local foo, download remote foo into local master, then merge local foo and master. Just look at the answer.

git fetch origin master^:foo
git fetch origin foo:master
git checkout foo
git merge master

Level 15:

git push origin :foo

Pushing empty deletes the remote branch foo… how weird.

git fetch orgin :bar

Fetching empty creates a local branch bar… uhh…

Level 16:

git pull origin foo is equivalent to:

git fetch origin foo; git merge o/foo

git pull origin bar~1:bugFix is equivalent to:

git fetch origin bar~1:bugFix; git merge bugFix

pull = fetch + merge

If the current local branch is bar:

git pull origin master:foo

It first creates a local branch named foo, downloads commits from the remote master branch, merges them into foo, and then merges foo into our currently checked-out branch bar.

When we use fetch to download from remote, if the specified local branch doesn’t exist, a new local branch will be created pointing to what we downloaded.

If we just fetch, the result is that we download o/master and o/bar locally (which is of course a benefit).

git checkout c1
git fetch origin master:side
git fetch origin bar:foo
git checkout master
git merge foo
git merge side

Various scenarios for rolling back in git:

answer:
1. Requirement: delete file a.c after add: use git reset HEAD or git restore --staged a.c to move files from the staging area back to the working directory. In VS Code you’ll see “Staged Changes” become “Changes”, proving the files have been rolled back to the working directory. But these files still remain in our directory; delete them manually with rm then (let me know if there’s a better way).
2. Requirement: if a previously committed file a.c was only modified and added this time, and you want to restore it to the state of the last commit: git reset HEAD or git restore --staged a.c restores the file from the staging area to the working directory; git restore a.c can restore it to the state of the last commit.
3. Requirement: how to roll back and delete a newly created file a.c that has been added and committed but not pushed: git reset HEAD a.c or git reset HEAD, then delete a.c and add, commit to indicate the deletion is OK.
4. Requirement: if a previously committed file a.c was modified, added, and committed this time, how to revert to the previous version: git reset HEAD^ a.c, git restore a.c, then add, commit to indicate the rollback is OK.
5. Requirement: rollback after push: git revert HEAD, then add, commit to indicate the rollback is OK.

Correct order for initializing and connecting to a remote repository

git init
git remote add origin git@github.com:adlternative/gitTest.git
git pull origin master --rebase=false
......
git add .
git commit -m ".."
git push --set-upstream origin master //将master设置跟踪origin/master再可以push

Brief introduction to git secret usage

暂时还没写

Brief introduction to git lfs usage

暂时还没写

The three modes of git reset: hard/soft/mixed (default)

The principle of git reset: move the pointer of the latest commit back to some earlier point in time; commits after that point disappear from history. git checkout changes where HEAD points; its principle is somewhat different from git reset.

Mode	Index	Commit	Working Directory
soft	rolls back	unchanged	unchanged
hard	rolls back	rolls back	rolls back (danger! files marked in .gitignore that are in the working directory will also be deleted)
mixed (default)	rolls back	rolls back	unchanged

git reset --soft HEAD git reset --hard HEAD git reset HEAD

Personally, after the last lesson, I only dare use the default reset now (all those untracked files marked in .gitignore were deleted by using the hard way). git commit regretted? Use git reset --soft HEAD^ to drop the latest commit.

What exactly does git rebase do

As shown in the figure, the master branch.

On the adl branch, we use git rebase master to move the private part of our content branch onto the master branch. Then that hidden line dies out. Then we can git checkout master to switch to the master branch, and git rebase adl to fast-forward master to the adl node (at this point there’s no moving of branch-private parts, because master and adl are on the same commit linked list, so the effect is just a fast move).

git游戏收获的经验和解答

…前面好多关没去写… 再补吧（爬）

远程

第11关：git 远程跟踪我们需要将我们的自己创建出来的新分支side设置为跟踪origin/master,这带来的后果是本应该跟踪origin/master 的本地master不再跟踪它了，当然这不是坏处…

下面跟踪了以后将远程的origin/master拉下来变基（中间我们可以对冲突的内容进行修改）,再推送上去就完事喽！

git branch -u o/master side
git pull --rebase
git push

第12关：

get到的点：

git push origin master是将本地的master分支比远程的master分支没有的提交添加上去，可以同步master和origin/master
在我们HEAD没有指向一个分支的情况下，直接git push会失效，这时候我们会需要git push origin master,在这种场景下我们需要考虑到的是我们是否应该让HEAD checkout 到某个分支，或者将git pull一下

git push origin foo

第13关：

git push origin foo^:master可以将foo之前的一个提交上传给远程的master,origin/master将会指向foo^

git push origin origin master:newBranch可以将master提交给远程的newBranch(本地会出现o/newBranch)即使newBranch不存在

git push origin master^:foo

git push origin foo:master

第14关：

git fetch就是下载远程origin/xxx放到本地orgin/xxx这样我们就可以先对远程分支进行检查，之后再合并

git fetch更像是含有git push 相反意义

需求是从远程的master前一个提交下载到本地的foo,再将远程的foo下载到本地的master,再将本地的foo和master进行合并，见答案即可

git fetch origin master^:foo
git fetch origin foo:master
git checkout foo
git merge master

第15关：

git push origin :foo

将空push会删除远程分支foo…这真诡异

git fetch orgin :bar

将空fetch会创建本地分支bar…这…

第16关：

git pull origin foo 相当于：

git fetch origin foo; git merge o/foo

git pull origin bar~1:bugFix 相当于：

git fetch origin bar~1:bugFix; git merge bugFix

pull = fetch+merge

如果当前本地在bar分支

git pull origin master:foo

它先在本地创建了一个叫 foo的分支，从远程仓库中的 master 分支中下载提交记录，并合并到 foo，然后再 merge 到我们的当前检出的分支 bar上。

我们使用fetch从远程下载的时候如果指定的本地分支不存在，会在本地创建一个新的分支指向我们的下载

如果我们只是fetch,带来的后果是下载到本地的o/master,o/bar(当然这是一个好处)

git checkout c1
git fetch origin master:side
git fetch origin bar:foo
git checkout master
git merge foo
git merge side

git需要注意的事项

it游戏收获的经验和解答 …前面好多关没去写 git 回退的三种方式：

git clean会删除那些未tracked的文件，也就是上一次commit没有，这次新创建的文件

git游戏收获的经验和解答

…前面好多关没去写… 再补吧（爬）

远程

下面跟踪了以后将远程的origin/master拉下来变基（中间我们可以对冲突的内容进行修改）,再推送上去就完事喽！

git branch -u o/master side
git pull --rebase
git push

第12关：

get到的点：

git push origin master是将本地的master分支比远程的master分支没有的提交添加上去，可以同步master和origin/master
在我们HEAD没有指向一个分支的情况下，直接git push会失效，这时候我们会需要git push origin master,在这种场景下我们需要考虑到的是我们是否应该让HEAD checkout 到某个分支，或者将git pull一下

git push origin foo

第13关：

git push origin foo^:master可以将foo之前的一个提交上传给远程的master,origin/master将会指向foo^

git push origin origin master:newBranch可以将master提交给远程的newBranch(本地会出现o/newBranch)即使newBranch不存在

git push origin master^:foo

git push origin foo:master

第14关：

git fetch就是下载远程origin/xxx放到本地orgin/xxx这样我们就可以先对远程分支进行检查，之后再合并

git fetch更像是含有git push 相反意义

需求是从远程的master前一个提交下载到本地的foo,再将远程的foo下载到本地的master,再将本地的foo和master进行合并，见答案即可

git fetch origin master^:foo
git fetch origin foo:master
git checkout foo
git merge master

第15关：

git push origin :foo

将空push会删除远程分支foo…这真诡异

git fetch orgin :bar

将空fetch会创建本地分支bar…这…

第16关：

git pull origin foo 相当于：

git fetch origin foo; git merge o/foo

git pull origin bar~1:bugFix 相当于：

git fetch origin bar~1:bugFix; git merge bugFix

pull = fetch+merge

如果当前本地在bar分支

git pull origin master:foo

它先在本地创建了一个叫 foo的分支，从远程仓库中的 master 分支中下载提交记录，并合并到 foo，然后再 merge 到我们的当前检出的分支 bar上。

我们使用fetch从远程下载的时候如果指定的本地分支不存在，会在本地创建一个新的分支指向我们的下载

如果我们只是fetch,带来的后果是下载到本地的o/master,o/bar(当然这是一个好处)

git checkout c1
git fetch origin master:side
git fetch origin bar:foo
git checkout master
git merge foo
git merge side

git 回退的n种场景：

answer:
1. 需求:删除add后的文件a.c:git reset HEAD或者git restore --staged a.c,将这些暂存区中的文件回退到工作区,在vscode中也可看到暂存的更改变成了更改,证明文件已经回滚到工作区了, 但这些文件仍然在我们的目录,这时候手动rm删除(如有更好方法请告诉我)
2. 需求:如果之前已经被提交的文件a.c本次只修改后add,想要恢复上一次提交的模样: git reset HEAD或者git restore --staged a.c将文件从暂存区中恢复到工作区, git restore a.c可以恢复到上一次commit时的状态
3. 需求:本次新建的文件a.c在add,commit未push的情况下如何回滚并删除: git reset HEAD a.c或者git reset HEAD后删除a.c并add,commit说明已经删除ok
4. 需求:如果之前已经被提交的文件a.c本次修改后add+commit如何回退上个版本: git reset HEAD^ a.c,git restore a.c接着再add,commit说明已经回退ok
5. 需求push 后回退: git revert HEAD接着再add,commit说明已经回退ok

git 初始化连接远程库的正确顺序

git init
git remote add origin git@github.com:adlternative/gitTest.git
git pull origin master --rebase=false
......
git add .
git commit -m ".."
git push --set-upstream origin master //将master设置跟踪origin/master再可以push

git secret　用法简介

暂时还没写

git lfs　用法简介

暂时还没写

git reset的三种模式 hard/soft/mixed(默认)

git reset的原理:让最新提交的指针回到以前某个时点，这个时间点之后的提交都从历史中消失。 git checkout 是在修改HEAD的指向，和git reset原理上有些不同

模式	缓存区	提交	工作目录
soft	会回退到过去	不变	不变
hard	会回退到过去	会回退到过去	会回退到过去(危险!那些gitignore中标记的文件因为在工作目录所以也会被删除掉)
mixed(默认)	会回退到过去	会回退到过去	不变
`git reset --soft HEAD`
`git reset --hard HEAD`
`git reset HEAD`
个人觉得经过上次的教训之后只敢使用默认的reset了(那些没有被Tracked的.gitignore中标记的文件全被删除了by use hard way)
`git commit`完后悔用`git reset --soft HEAD^`放弃最新提交

git rebase 究竟在做什么

如图所示，master分支

我们在adl分支通过git rebase master将自己的内容分支私有的部分移动到master分支上，接着这条暗线就消亡了，接着我们可以通过git checkout master切换到master分支，再git rebase adl将master快速前进到adl节点（这时候没有啥移动分支私有部分，因为master和adl在同一条提交链表上，于是乎作用就是快速移动）

My Git Learning Journey

Lessons and answers from the git game

Remote

Things to keep in mind with git

Lessons and answers from the git game

Remote

Various scenarios for rolling back in git:

Correct order for initializing and connecting to a remote repository

Brief introduction to git secret usage

Brief introduction to git lfs usage

The three modes of git reset: hard/soft/mixed (default)

What exactly does git rebase do

git游戏收获的经验和解答

远程

git需要注意的事项

git游戏收获的经验和解答

远程

git 回退的n种场景：

git 初始化连接远程库的正确顺序

git secret 用法简介

git lfs 用法简介

git reset的三种模式 hard/soft/mixed(默认)

git rebase 究竟在做什么

git secret　用法简介

git lfs　用法简介