关于git stash命令的解释和场景设计

最新推荐文章于 2025-03-25 20:04:55 发布

爱幻想的孙小编

最新推荐文章于 2025-03-25 20:04:55 发布

阅读量1k

点赞数

分类专栏： git 源码管理

本文链接：https://blog.youkuaiyun.com/u010270891/article/details/89812632

版权

git stash用于在切换分支时暂存未提交的改动，避免污染其他分支。在修复bug或切换工作流时尤其有用。文章通过多个场景演示了git stash的操作效果，包括未add、已add未commit和已commit的情况，以及stash后的恢复和冲突处理。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

git stash 操作的意义，就是从A分支切换到其他（master或者其他）分支时，若A分支中有修改的内容没有commit，为了防止在其他所有（master和其他）分支中出现相应的内容而进行的临时保存的操作。

该过程在解决bug时十分重要。程序要在自己分支中写代码，程序值完成一部分，此时之前版本出现bug（例如线上问题），急需解决，此时可以利用stash操作，后切换到其他分支解决bug。

场景设计

1、在master创建并切换到分支test1_add，修改readme.md文件（添加一行内容），此时不进行任何操作（不add，也不commit），切换回master分支，则master分支会显示刚刚添加的内容

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (master)
$ git status
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (master)
$ git checkout -b test_add
Switched to a new branch 'test_add'

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (test_add)
$ git log
commit 457a5442c4b1db4a3f5c45142b7ce641065f8bb4 (HEAD -> test_add, origin/master, origin/HEAD, master)
Author: sunmingming99 <2238674937@qq.com>
Date:   Sat May 4 12:56:19 2019 +0800

    Initial commit

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (test_add)
$ vim README.md

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (test_add)
$ git status
On branch test_add
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")


Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (test_add)
$ git branch
  master
* test_add


Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (test_add)
$ git checkout master
Switched to branch 'master'
M       README.md
Your branch is up to date with 'origin/master'.

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (master)
$ vim README.md

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (master)
$ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (master)
$ cat README.md
# testGit
first we use put a sentence in this file.

如图为添加的内容

2、在分支test1_add，修改readme.md文件（添加一行内容），此时只进行add操作（不commit），切换回master分支，则master分支会显示刚刚添加的内容

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (master)
$ git checkout test_add
Switched to branch 'test_add'
M       README.md

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (test_add)
$ vim README.md


Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (test_add)
$ git status
On branch test_add
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   README.md

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   README.md


Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (test_add)
$ git checkout master
Switched to branch 'master'
M       README.md
Your branch is up to date with 'origin/master'.

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (master)
$ cat README.md
# testGit
##first we use put a sentence in this file.
##this is used for command add.
this is only use command add.

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (master)
$

如图为添加的内容

3、在分支test1_add，修改readme.md文件（添加一行内容），此时进行add和commit操作，切换回master分支，则master分支不显示提交的内容

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (master)
$ git checkout test_add
Switched to branch 'test_add'
M       README.md

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (test_add)
$ vim README.md

Sunshine@Sunshine-pc MINGW64 /d/gitProjects/testGit (