continue--abort abort and check out the original branch--quit abort but keep HEAD where it is**--edit-todo edit the todo list during an interactive rebase**--show-current-patch show the patch file being applied
pick:保留该commit(缩写:p)reword:保留该commit,但我需要修改该commit的注释(缩写:r) edit:保留该commit,但我要停下来修改该提交(不仅仅修改注释)(缩写:e)squash:将该commit和前一个commit合并(缩写:s)fixup:将该commit和前一个commit合并,但我不要保留该提交的注释信息(缩写:f)exec:执行shell命令(缩写:x)d...
将其他分支多个commit合并到主分支,并形成一个新commit: 我不建议这么使用,除非这里的分支合并完以后就不使用了,不然的话,以后有新的提交,再次合并,很可能忘记从那个commit开始合并。 命令: 我们使用命令的形式为: git rebase [startpoint] [endpoint] --onto [branchName] ...
You are currently editing a commit while rebasing branch 'rebase_i' on '9119c19'. #您当前正在编辑提交,同时重新建立分支 #使用"git commit——amend"修改当前提交 use "git commit --amend" to amend the current commit #当你对你的更改感到满意时,使用“git rebase——continue” use "git rebase --...
temporary area are then reapplied to the current branch, one by one, in order. Note that any commits inHEADwhich introduce the same textual changes as a commit inHEAD..<upstream>are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be ...
1.git branch创建分支 创建newImage分支 git branch newImage 提交新branch分支 git commit 这里注意到newImage并没有动,master到下面去了,这证明我们并未切换到newImage这个分支上 在git中,*这个符号代表你现在所在的分支。 于是我们需要—— 2.git checkout 切换分支 ...
Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch. <branch> Working branch; defaults to HEAD. --continue Restart the rebasing process after having resolved a merge conflict. ...
break = stop here (continue rebase later with 'git rebase --continue') # d, drop <commit> = remove commit # l, label = label current HEAD with a name # t, reset = reset HEAD to a label # m, merge [-C <commit> | -c <commit>] [# <oneline>] # . create a merge comm...
我们看到上面有四次commit,如何将这个四次合并到一次呢? 压缩 使用下面的命令,最后一个数字4代表压缩最后四次提交。 git rebase -i HEAD~4 1. 该命令执行后,会弹出vim的编辑窗口,4次提交的信息会倒序排列,最上面的是第四次提交,最下面的是最近一次提交。
# d, drop <commit> = remove commit # l, label = label current HEAD with a name # t, reset = reset HEAD to a label # m, merge [-C <commit> | -c <commit>] [# <oneline>] # . create a merge commit using the original merge commit's # . message (or the ...