Question

我猜我犯了一个错误

昨天我创建了一个新分支（feature/crud-suppliers），然后昨天又今天创建了该分支。 30分钟前，完成更改后，我添加了修改过的文件并进行了git commit --amend --no-edit操作，然后我想起以前没有提交任何内容，因此我想向该提交添加一条消息。

我认为使用git rebase -i HEAD~2可以进入并更改消息，但是提交不存在，所以我只是按下退出ctrl + X并注意到它完成了基准。.

此后，我的编辑消失了，几分钟前，我推送了所有内容以检查是否可以在github上找到这些编辑，但是没有运气。

我尝试了git reflog，但是在重新设置基准之前检查哈希没有显示我的修改。

这是我的git reflog：

637b687 (HEAD, master) HEAD@{0}: checkout: moving from feature/crud-suppliers to 637b687
a55e9d9 (origin/feature/crud-suppliers, feature/crud-suppliers) HEAD@{1}: checkout: moving from 3f5931ac661a4d4ee983fe0a173ae309a874be83 to feature/crud-suppliers
3f5931a HEAD@{2}: checkout: moving from 8dd9857224adf665df1d5d981c067d6068c3bea6 to 3f5931a
8dd9857 HEAD@{3}: checkout: moving from feature/crud-suppliers to 8dd9857
a55e9d9 (origin/feature/crud-suppliers, feature/crud-suppliers) HEAD@{4}: checkout: moving from feature/crud-products to feature/crud-suppliers
9ed4250 (origin/feature/crud-products, feature/crud-products) HEAD@{5}: checkout: moving from develop to feature/crud-products
069daa3 (origin/develop, develop) HEAD@{6}: checkout: moving from feature/crud-suppliers to develop
a55e9d9 (origin/feature/crud-suppliers, feature/crud-suppliers) HEAD@{7}: rebase -i (finish): returning to refs/heads/feature/crud-suppliers
a55e9d9 (origin/feature/crud-suppliers, feature/crud-suppliers) HEAD@{8}: rebase -i (start): checkout HEAD~2
a55e9d9 (origin/feature/crud-suppliers, feature/crud-suppliers) HEAD@{9}: checkout: moving from 3f5931ac661a4d4ee983fe0a173ae309a874be83 to feature/crud-suppliers
3f5931a HEAD@{10}: checkout: moving from a55e9d98dc253dfb72461e7f4ef07dc815df0400 to 3f5931a
a55e9d9 (origin/feature/crud-suppliers, feature/crud-suppliers) HEAD@{11}: checkout: moving from feature/crud-suppliers to a55e9d9
a55e9d9 (origin/feature/crud-suppliers, feature/crud-suppliers) HEAD@{12}: rebase -i (finish): returning to refs/heads/feature/crud-suppliers
a55e9d9 (origin/feature/crud-suppliers, feature/crud-suppliers) HEAD@{13}: rebase -i (start): checkout HEAD~2
a55e9d9 (origin/feature/crud-suppliers, feature/crud-suppliers) HEAD@{14}: rebase -i (finish): returning to refs/heads/feature/crud-suppliers
a55e9d9 (origin/feature/crud-suppliers, feature/crud-suppliers) HEAD@{15}: rebase -i (pick): CRUD employees
3f5931a HEAD@{16}: rebase -i (pick): Added new ways to retreive company informations
8dd9857 HEAD@{17}: rebase -i (pick): Created company user views
faedafc HEAD@{18}: rebase -i (pick): Changed email link to reset password
9b54992 HEAD@{19}: rebase -i (start): checkout HEAD~2
b69bfb0 HEAD@{20}: commit (amend): Merge pull request #11 from alebuffoli/feature/crud-employees
069daa3 (origin/develop, develop) HEAD@{21}: checkout: moving from feature/crud-products to feature/crud-suppliers

更新

以下建议的方法有效，但实际上，在收到有关此问题的任何答复之前，我能够使用编辑器（Pycharm）的历史记录功能恢复所有丢失的更改，因此我想提一下如果您处于类似情况并且无法使用以下方法恢复更改。

Answer 1

git还会保留单个分支的日志：运行

git reflog feature/crud-suppliers

仅查看移动该分支的操作。

默认情况下：git rebase会完全删除合并提交。如果您的更改存储在提交Merge pull request #11 from ...中，那么运行git rebase HEAD~2会丢弃该提交。

您可以使用-r|--rebase-merges保留它们。

恢复在提交修改期间丢失的提交

更新

1 个答案: