git status 求解

Question

git status 求解

ZivSF

56019149221

发布于
2019-07-25

更新于
2019-07-25

工作区更改没有add到暂存区，连续操作了undo，不知道为什么更改不见了！
git reflog 重复操作很多，请看最底下合并是问题之前的操作

git status

On branch strand
Your branch is ahead of 'origin/strand' by 16 commits.
  (use "git push" to publish your local commits)

git-rebase-todo is missing.
No commands done.
No commands remaining.
You are currently editing a commit while rebasing branch 'master' on '(NULL)'.
  (use "git commit --amend" to amend the current commit)
  (use "git rebase --continue" once you are satisfied with your changes)

nothing to commit, working tree clean

git reflog

$ git reflog
674ef7d (HEAD -> strand, master) HEAD@{0}:  redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{1}:  redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{2}:  redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{3}:  redo: updating HEAD
002e2f9 HEAD@{4}:                           redo: updating HEAD
002e2f9 HEAD@{5}:                           redo: updating HEAD
ff6b227 (origin/strand) HEAD@{6}:           redo: updating HEAD
ff6b227 (origin/strand) HEAD@{7}:           undo: updating HEAD
ff6b227 (origin/strand) HEAD@{8}:           undo: updating HEAD
002e2f9 HEAD@{9}:                           redo: updating HEAD
ff6b227 (origin/strand) HEAD@{10}:          redo: updating HEAD
ff6b227 (origin/strand) HEAD@{11}:          redo: updating HEAD
002e2f9 HEAD@{12}:                          redo: updating HEAD
ff6b227 (origin/strand) HEAD@{13}:          redo: updating HEAD
002e2f9 HEAD@{14}:                          redo: updating HEAD
ff6b227 (origin/strand) HEAD@{15}:          redo: updating HEAD
002e2f9 HEAD@{16}:                          redo: updating HEAD
ff6b227 (origin/strand) HEAD@{17}:          redo: updating HEAD
002e2f9 HEAD@{18}:                          undo: updating HEAD
ff6b227 (origin/strand) HEAD@{19}:          undo: updating HEAD
002e2f9 HEAD@{20}:                          undo: updating HEAD
ff6b227 (origin/strand) HEAD@{21}:          undo: updating HEAD
002e2f9 HEAD@{22}:                          undo: updating HEAD
ff6b227 (origin/strand) HEAD@{23}:          undo: updating HEAD
002e2f9 HEAD@{24}:                          undo: updating HEAD
ff6b227 (origin/strand) HEAD@{25}:          undo: updating HEAD
ff6b227 (origin/strand) HEAD@{26}:          undo: updating HEAD
002e2f9 HEAD@{27}:                          undo: updating HEAD
002e2f9 HEAD@{28}:                          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{29}: redo: updating HEAD
002e2f9 HEAD@{30}:                          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{31}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{32}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{33}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{34}: redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{35}: redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{36}: redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{37}: redo: updating HEAD
002e2f9 HEAD@{38}:                          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{39}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{40}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{41}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{42}: checkout: moving from strand to strand
674ef7d (HEAD -> strand, master) HEAD@{43}: checkout: moving from strand to strand
674ef7d (HEAD -> strand, master) HEAD@{44}: redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{45}: redo: updating HEAD
002e2f9 HEAD@{46}:                          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{47}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{48}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{49}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{50}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{51}: redo: updating HEAD
002e2f9 HEAD@{52}:                          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{53}: undo: updating HEAD
:
674ef7d (HEAD -> strand, master) HEAD@{0}:  redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{1}:  redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{2}:  redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{3}:  redo: updating HEAD
002e2f9 HEAD@{4}:                           redo: updating HEAD
002e2f9 HEAD@{5}:                           redo: updating HEAD
ff6b227 (origin/strand) HEAD@{6}:           redo: updating HEAD
ff6b227 (origin/strand) HEAD@{7}:           undo: updating HEAD
ff6b227 (origin/strand) HEAD@{8}:           undo: updating HEAD
002e2f9 HEAD@{9}:                           redo: updating HEAD
ff6b227 (origin/strand) HEAD@{10}:          redo: updating HEAD
ff6b227 (origin/strand) HEAD@{11}:          redo: updating HEAD
002e2f9 HEAD@{12}:                          redo: updating HEAD
ff6b227 (origin/strand) HEAD@{13}:          redo: updating HEAD
002e2f9 HEAD@{14}:                          redo: updating HEAD
ff6b227 (origin/strand) HEAD@{15}:          redo: updating HEAD
002e2f9 HEAD@{16}:                          redo: updating HEAD
ff6b227 (origin/strand) HEAD@{17}:          redo: updating HEAD
002e2f9 HEAD@{18}:                          undo: updating HEAD
ff6b227 (origin/strand) HEAD@{19}:          undo: updating HEAD
002e2f9 HEAD@{20}:                          undo: updating HEAD
ff6b227 (origin/strand) HEAD@{21}:          undo: updating HEAD
002e2f9 HEAD@{22}:                          undo: updating HEAD
ff6b227 (origin/strand) HEAD@{23}:          undo: updating HEAD
002e2f9 HEAD@{24}:                          undo: updating HEAD
ff6b227 (origin/strand) HEAD@{25}:          undo: updating HEAD
ff6b227 (origin/strand) HEAD@{26}:          undo: updating HEAD
002e2f9 HEAD@{27}:                          undo: updating HEAD
002e2f9 HEAD@{28}:                          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{29}: redo: updating HEAD
002e2f9 HEAD@{30}:                          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{31}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{32}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{33}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{34}: redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{35}: redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{36}: redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{37}: redo: updating HEAD
002e2f9 HEAD@{38}:                          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{39}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{40}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{41}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{42}: checkout: moving from strand to strand
674ef7d (HEAD -> strand, master) HEAD@{43}: checkout: moving from strand to strand
674ef7d (HEAD -> strand, master) HEAD@{44}: redo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{45}: redo: updating HEAD
002e2f9 HEAD@{46}:                          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{47}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{48}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{49}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{50}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{51}: redo: updating HEAD
002e2f9 HEAD@{52}:                          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{53}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{54}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{55}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{56}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{57}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{58}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{59}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{60}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{61}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{62}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{63}: rebase -i (skip): updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{64}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{65}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{66}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{67}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{68}: checkout: moving from strand to strand
674ef7d (HEAD -> strand, master) HEAD@{69}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{70}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{71}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{72}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{73}: redo: updating HEAD
002e2f9 HEAD@{74}:                          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{75}: undo: updating HEAD
ff6b227 (origin/strand) HEAD@{76}:          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{77}: undo: updating HEAD
ff6b227 (origin/strand) HEAD@{78}:          undo: updating HEAD
ff6b227 (origin/strand) HEAD@{79}:          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{80}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{81}: reset: moving to HEAD
674ef7d (HEAD -> strand, master) HEAD@{82}: undo: updating HEAD
ff6b227 (origin/strand) HEAD@{83}:          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{84}: merge master: Fast-forward
ff6b227 (origin/strand) HEAD@{85}:          checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{86}: checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{87}:          checkout: moving from strand to strand
ff6b227 (origin/strand) HEAD@{88}:          checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{89}: checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{90}:          checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{91}: merge origin/master: Merge made by the 'recursive' strategy.
002e2f9 HEAD@{92}:                          checkout: moving from master to master
002e2f9 HEAD@{93}:                          checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{94}:          checkout: moving from strand to strand
ff6b227 (origin/strand) HEAD@{95}:          checkout: moving from master to strand
002e2f9 HEAD@{96}:                          checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{97}:          checkout: moving from master to strand
002e2f9 HEAD@{98}:                          checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{99}:          checkout: moving from master to strand
002e2f9 HEAD@{100}:                         checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{101}:         checkout: moving from master to strand
002e2f9 HEAD@{102}:                         merge strand: Merge made by the 'recursive' strategy.
d79fee1 HEAD@{103}:                         checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{104}:         checkout: moving from master to strand
d79fee1 HEAD@{105}:                         checkout: moving from master to master
d79fee1 HEAD@{106}:                         checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{107}:         checkout: moving from master to strand
d79fee1 HEAD@{108}:                         checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{109}:         checkout: moving from strand to strand
ff6b227 (origin/strand) HEAD@{110}:         checkout: moving from master to strand
d79fee1 HEAD@{111}:                         checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{112}:         checkout: moving from master to strand
d79fee1 HEAD@{113}:                         checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{114}:         checkout: moving from master to strand
d79fee1 HEAD@{115}:                         checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{116}:         checkout: moving from master to strand
d79fee1 HEAD@{117}:                         pull --ff-only --progress: Fast-forward
:
674ef7d (HEAD -> strand, master) HEAD@{61}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{62}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{63}: rebase -i (skip): updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{64}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{65}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{66}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{67}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{68}: checkout: moving from strand to strand
674ef7d (HEAD -> strand, master) HEAD@{69}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{70}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{71}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{72}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{73}: redo: updating HEAD
002e2f9 HEAD@{74}:                          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{75}: undo: updating HEAD
ff6b227 (origin/strand) HEAD@{76}:          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{77}: undo: updating HEAD
ff6b227 (origin/strand) HEAD@{78}:          undo: updating HEAD
ff6b227 (origin/strand) HEAD@{79}:          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{80}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{81}: reset: moving to HEAD
674ef7d (HEAD -> strand, master) HEAD@{82}: undo: updating HEAD
ff6b227 (origin/strand) HEAD@{83}:          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{84}: merge master: Fast-forward
ff6b227 (origin/strand) HEAD@{85}:          checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{86}: checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{87}:          checkout: moving from strand to strand
ff6b227 (origin/strand) HEAD@{88}:          checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{89}: checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{90}:          checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{91}: merge origin/master: Merge made by the 'recursive' strategy.
002e2f9 HEAD@{92}:                          checkout: moving from master to master
002e2f9 HEAD@{93}:                          checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{94}:          checkout: moving from strand to strand
ff6b227 (origin/strand) HEAD@{95}:          checkout: moving from master to strand
002e2f9 HEAD@{96}:                          checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{97}:          checkout: moving from master to strand
002e2f9 HEAD@{98}:                          checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{99}:          checkout: moving from master to strand
002e2f9 HEAD@{100}:                         checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{101}:         checkout: moving from master to strand
002e2f9 HEAD@{102}:                         merge strand: Merge made by the 'recursive' strategy.
d79fee1 HEAD@{103}:                         checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{104}:         checkout: moving from master to strand
d79fee1 HEAD@{105}:                         checkout: moving from master to master
d79fee1 HEAD@{106}:                         checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{107}:         checkout: moving from master to strand
d79fee1 HEAD@{108}:                         checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{109}:         checkout: moving from strand to strand
ff6b227 (origin/strand) HEAD@{110}:         checkout: moving from master to strand
d79fee1 HEAD@{111}:                         checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{112}:         checkout: moving from master to strand
d79fee1 HEAD@{113}:                         checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{114}:         checkout: moving from master to strand
d79fee1 HEAD@{115}:                         checkout: moving from strand to master
:
674ef7d (HEAD -> strand, master) HEAD@{61}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{62}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{63}: rebase -i (skip): updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{64}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{65}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{66}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{67}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{68}: checkout: moving from strand to strand
674ef7d (HEAD -> strand, master) HEAD@{69}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{70}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{71}: checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{72}: checkout: moving from strand to master
674ef7d (HEAD -> strand, master) HEAD@{73}: redo: updating HEAD
002e2f9 HEAD@{74}:                          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{75}: undo: updating HEAD
ff6b227 (origin/strand) HEAD@{76}:          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{77}: undo: updating HEAD
ff6b227 (origin/strand) HEAD@{78}:          undo: updating HEAD
ff6b227 (origin/strand) HEAD@{79}:          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{80}: undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{81}: reset: moving to HEAD
674ef7d (HEAD -> strand, master) HEAD@{82}: undo: updating HEAD
ff6b227 (origin/strand) HEAD@{83}:          undo: updating HEAD
674ef7d (HEAD -> strand, master) HEAD@{84}: merge master: Fast-forward
ff6b227 (origin/strand) HEAD@{85}:          checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{86}: checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{87}:          checkout: moving from strand to strand
ff6b227 (origin/strand) HEAD@{88}:          checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{89}: checkout: moving from strand to master
ff6b227 (origin/strand) HEAD@{90}:          checkout: moving from master to strand
674ef7d (HEAD -> strand, master) HEAD@{91}: merge origin/master: Merge made by the 'recursive' strategy.

gitlab github git

阅读 1.7k

撰写回答

你尚未登录，登录后可以

和开发者交流问题的细节
关注并接收问题和回答的更新提醒
参与内容的编辑和改进，让解决方法与时俱进

推荐问题

Microsoft

子站问答

访问

相似问题

找不到问题？创建新问题

git status 求解

你尚未登录，登录后可以

关于 git pull 和 git merge 在使用上的区别？

git clone 的地址含有中文路径名要怎么解决 ?

我在feat分支执行`git fetch`，请问下：会fetch master和feat的新增的commit吗？还是只会fetch当前分支feat的新增的commit？

如何删除Git subtree push时产生的缓存并解决内存溢出问题?

gitee怎么像GitHub一样提供文件下载？

lazyvim windows find 命令报错如何处理？

git提交记录问题？

Microsoft

git status 求解

你尚未登录，登录后可以

关于 git pull 和 git merge 在使用上的区别？

git clone 的地址含有中文路径名 要怎么解决 ?

我在feat分支执行`git fetch`，请问下： 会fetch master和feat的新增的commit吗？还是只会fetch当前分支feat的新增的commit？

如何删除Git subtree push时产生的缓存并解决内存溢出问题?

gitee怎么像GitHub一样提供文件下载？

lazyvim windows find 命令报错如何处理？

git提交记录问题？

Microsoft

git clone 的地址含有中文路径名要怎么解决 ?

我在feat分支执行`git fetch`，请问下：会fetch master和feat的新增的commit吗？还是只会fetch当前分支feat的新增的commit？