Detailed explanation of the temporary storage operation of 'git stash'

Why we need it

Not allowed Needless to say, when I learned about this command and when I used it later, I loved this command so much because it is so easy to use.

Let me tell you about the scenario where I used this command:

At this time, I was in the feature_666 branch, and I was very focused and focused on implementing a feature 666 module. I could write code like a flying keyboard~ ~~
Then at this time, the customer reported a bug, which was very serious and must be solved immediately, with a priority of 0! ! !
So, I need to go to the release branch to checkout the new branch to work, but what should I do if the 666 function is not completed yet?
At this time I faced a multiple-choice question:
A: Switch after submission, the code is saved to branch feature_666, but a meaningless submission is generated
B: Switch directly without submitting, but this option is not available at all Will choose.

Isn’t it difficult to choose? At this time, don’t forget that there is option C!

C: Use git stash to store the current modification (uncommitted code) in the cache, switch branches to modify the bug, and then come back and take it out through git stash pop.

1. Temporary storage operation

#查看当前状态
git status 
#如果有修改,添加修改文件
git add .
#暂存操作
git stash save '本次暂存的标识名字'

2. View the current temporary records

#查看记录
git stash list

Where are the modifications stored?

When we use git init to add version control to the project, it will be in A .git hidden folder is generated under the project path. .git stores all information for version management.
.git/refs/stash stores the node pointer corresponding to the last stash

Similarly, you can see all our stash record information in .git/log/refs/stash

The situation of storing multiple stash

ok, let’s try to modify the file, and then use git stash again. At this time we have two temporary modifications, so what? Check it out?

git stash list //View all temporary modification records in the temporary storage area

If you execute git stash twice without committing it, you cannot accurately distinguish the specific modifications of the two stashes. What content, used in this way, makes Git appear great? It is not smart at all, how could it be possible! .

So, in this case, it is obviously very important to give the stash stored modifications a name, as follows:

git stash save <message>

3. Restore the temporary work

'The pop command restores. After the restore, the temporary storage area will delete the current record'

#恢复指定的暂存工作, 暂存记录保存在list内,需要通过list索引index取出恢复
git stash pop stash@{index}

'The apply command restores. After the restore, the temporary storage area The current record will be retained'

#恢复指定的暂存工作, 暂存记录保存在list内,需要通过list索引index取出恢复
git stash apply stash@{index}

4. Delete temporary storage
##

#删除某个暂存, 暂存记录保存在list内,需要通过list索引index取出恢复
git stash drop stash@{index}
#删除全部暂存
git stash clear

Recommended tutorial: "

Git Tutorial》

The above is the detailed content of Detailed explanation of the temporary storage operation of 'git stash'. For more information, please follow other related articles on the PHP Chinese website!