git rebase 后找回消失的commit

在git rebase操作时，存在冲突时，使用git rebase --abort处理后，结果发现commit的修改和记录都没有了。(使用git rebase --skip处理，也有导致commit消失不见得情况)，就是使用git log看不到。

并不是真的在git中完全消失了。

这是可以使用reflog命令列出log 信息。
reflog : reference logs

$ git reflog
d185b35 HEAD@{0}: rebase finished: returning to refs/heads/passport
d185b35 HEAD@{1}: rebase: checkout origin/passport
4ab8e52 HEAD@{2}: checkout: moving from passport_email to passport
d185b35 HEAD@{3}: checkout: moving from passport to passport_email
4ab8e52 HEAD@{4}: checkout: moving from passprot_bak to passport
d185b35 HEAD@{5}: checkout: moving from passport to passprot_bak
4ab8e52 HEAD@{6}: checkout: moving from passprot_bak to passport
d185b35 HEAD@{7}: commit: 添加邮件发送处理操作
............

这里显示了commit 的sha, version, message，找到你消失的commit，然后可以使用这个‘消失的’commit重新建立一个branch.

$git checkout -b branch-bak [commit-sha]

然后可以出来冲突，再git add, git commit, git push等操作，把修改提交。

最后，看看git help

NAMEgit-reflog - Manage reflog informationSYNOPSISgit reflog <subcommand> <options>DESCRIPTIONThe command takes various subcommands, and different options depending on the subcommand:git reflog [show] [log-options] [<ref>]git reflog expire [--expire=<time>] [--expire-unreachable=<time>][--rewrite] [--updateref] [--stale-fix][--dry-run] [--verbose] [--all | <refs>...]git reflog delete [--rewrite] [--updateref][--dry-run] [--verbose] ref@{specifier}...Reference logs, or "reflogs", record when the tips of branches and other references were updated in the localrepository. Reflogs are useful in various Git commands, to specify the old value of a reference. For example,HEAD@{2} means "where HEAD used to be two moves ago", master@{one.week.ago} means "where master used to point toone week ago in this local repository", and so on. See gitrevisions(7) for more details.This command manages the information recorded in the reflogs.The "show" subcommand (which is also the default, in the absence of any subcommands) shows the log of thereference provided in the command-line (or HEAD, by default). The reflog covers all recent actions, and inaddition the HEAD reflog records branch switching. git reflog show is an alias for git log -g --abbrev-commit--pretty=oneline; see git-log(1) for more information.The "expire" subcommand prunes older reflog entries. Entries older than expire time, or entries older thanexpire-unreachable time and not reachable from the current tip, are removed from the reflog. This is typicallynot used directly by end users -- instead, see git-gc(1).The "delete" subcommand deletes single entries from the reflog. Its argument must be an exact entry (e.g. "gitreflog delete master@{2}"). This subcommand is also typically not used directly by end users.OPTIONSOptions for showgit reflog show accepts any of the options accepted by git log.Options for expire--allProcess the reflogs of all references.--expire=<time>Prune entries older than the specified time. If this option is not specified, the expiration time is takenfrom the configuration setting gc.reflogExpire, which in turn defaults to 90 days.  --expire=all prunesentries regardless of their age; --expire=never turns off pruning of reachable entries (but see--expire-unreachable).--expire-unreachable=<time>Prune entries older than <time> that are not reachable from the current tip of the branch. If this option isnot specified, the expiration time is taken from the configuration setting gc.reflogExpireUnreachable, whichin turn defaults to 30 days.  --expire-unreachable=all prunes unreachable entries regardless of their age;--expire-unreachable=never turns off early pruning of unreachable entries (but see --expire).--updaterefUpdate the reference to the value of the top reflog entry (i.e. <ref>@{0}) if the previous top entry waspruned. (This option is ignored for symbolic references.)…………

git rebase 后找回消失的commit相关推荐

git rebase branch内部调整调整commit顺序
git rebase -i commitID commitID相当于根,所以调整的是下游的commitID 命令行处理 1.准备数据文本内容 version1 version2 version3 v ...
Git Rebase后，本地代码丢失解决方法
问题描述: 提交代码时,因为文件太大,多次push失败,然后打算回退,rebase了两次,本地代码丢失了,吓得我差点跳起来. lcc@lcc MyDoc$ git reset --hard 9c15d ...
git rebase后撤回
1.git reflog 查看所有操作日志 2. git reset --hard bbc9da41b5(commitid) 回到初始状态
找回git rebase --skip消失的代码
多人开发项目的时候,大家都会用到git rebase这一命令,那么,merge报错时一般有两种选择: 一.解决冲突处理好冲突文件,然后重新提交,并继续rebase git add . git reb ...
git 代码没了，git rebase 合并提交记录，git stash
xx 问题 git合并提交记录创建提交记录合并提交记录 rebase有冲突合并后的本地路径提交到远程其中的参数 pick 改变提交 5.txt 和 4.txt 的顺序删除某一个提交 rewo ...
Git rebase命令实战
一.前言一句话,git rebase 可以帮助项目中的提交历史干净整洁!!! 二.避免合并出现分叉现象 git merge操作 1.新建一个 develop 分支 2.在develop分支上新建 ...
git rebase的两种用法(最全)
rebase的两种用法用法一: 合并当前分支的多个commit记录 1. 找到想要合并的commit, 使用rebase -i 2. 进入Interact交互界面 3.使用s命令合并到上一个com ...
git rebase 修改备注信息
git commit 未push 修改备注未push比较简单① $ git commit --amend 进行修改② 按esc退出编辑模式,输入:wq保存并退出注意中文esc请切换至英文③ $ gi ...
合并代码还在用git merge吗？我们都用git rebase！
欢迎关注方志朋的博客,回复"666"获面试宝典 git merge 和 git rebase的区别目的都是将一个分支的 commit 合并到到另外一个分支中去. git merg ...

git rebase 后找回消失的commit

git rebase 后找回消失的commit

git rebase 后找回消失的commit相关推荐

最新文章

热门文章