假设你的工作分支将会做对于master的pull-request。一般情况下你不关心提交(commit)的时间戳，只想组合所有提交(commit)到一个单独的里面,然后重置(reset)重提交(recommit)。确保主(master)分支是最新的和你的变化都已经提交了,然后:

(my-branch)$gitreset--softmaster
(my-branch)$gitcommit-am"Newawesomefeature"

如果你想要更多的控制,想要保留时间戳,你需要做交互式rebase(interactiverebase):

(my-branch)$gitrebase-imaster

如果没有相对的其它分支，你将不得不相对自己的HEAD进行rebase。例如：你想组合最近的两次提交(commit),你将相对于HEAD\~2进行rebase，组合最近3次提交(commit),相对于HEAD\~3,等等。

(master)$gitrebase-iHEAD~2

在你执行了交互式rebase的命令(interactiverebasecommand)后,你将在你的编辑器里看到类似下面的内容:

picka9c8a1dSomerefactoring
pick01b2fd8Newawesomefeature
pickb729ad5fixup
picke3851e8anotherfix

##Rebase8074d12..b729ad5onto8074d12
#
##Commands:
##p,pick=usecommit
##r,reword=usecommit,buteditthecommitmessage
##e,edit=usecommit,butstopforamending
##s,squash=usecommit,butmeldintopreviouscommit
##f,fixup=like"squash",butdiscardthiscommit'slogmessage
##x,exec=runcommand(therestoftheline)usingshell
#
##Theselinescanbere-ordered;theyareexecutedfromtoptobottom.
#
##IfyouremovealinehereTHATCOMMITWILLBELOST.
#
##However,ifyouremoveeverything,therebasewillbeaborted.
#
##Notethatemptycommitsarecommentedout

所有以#开头的行都是注释,不会影响rebase.

然后，你可以用任何上面命令列表的命令替换pick,你也可以通过删除对应的行来删除一个提交(commit)。

推荐：太赞了，SpringBoot+Vue前后端分离完整入门教程！

例如,如果你想单独保留最旧(first)的提交(commit),组合所有剩下的到第二个里面,你就应该编辑第二个提交(commit)后面的每个提交(commit)前的单词为f:

picka9c8a1dSomerefactoring
pick01b2fd8Newawesomefeature
fb729ad5fixup
fe3851e8anotherfix

如果你想组合这些提交(commit)并重命名这个提交(commit),你应该在第二个提交(commit)旁边添加一个r，或者更简单的用s替代f:

picka9c8a1dSomerefactoring
pick01b2fd8Newawesomefeature
sb729ad5fixup
se3851e8anotherfix

你可以在接下来弹出的文本提示框里重命名提交(commit)。

Newer,awesomerfeatures

##Pleaseenterthecommitmessageforyourchanges.Linesstarting
##with'#'willbeignored,andanemptymessageabortsthecommit.
##rebaseinprogress;onto8074d12
##Youarecurrentlyeditingacommitwhilerebasingbranch'master'on'8074d12'.
#
##Changestobecommitted:
#modified:README.md
#

如果成功了,你应该看到类似下面的内容:

(master)$Successfullyrebasedandupdatedrefs/heads/master.

(master)$gitmerge--no-ff--no-commitmy-branch

(master)$gitmerge--squashmy-branch

(master)$gitrebase-i@{u}

(master)$gitlog--graph--left-right--cherry-pick--onelineHEAD...feature/120-on-scroll

(master)$gitlogmaster^feature/120-on-scroll--no-merges

noop

(my-branch)$gitstatus
Onbranchmy-branch
Changesnotstagedforcommit:
(use"gitadd..."toupdatewhatwillbecommitted)
(use"gitcheckout--..."todiscardchangesinworkingdirectory)

modified:README.md

<<<<<<somecode
=========
somecode
>>>>>>>new-commit

(master*)$gitmergetool-topendiff

(my-branch)$gitaddREADME.md
(my-branch)$gitrebase--continue

(my-branch)$gitrebase--abort

$gitclone--recursivegit://github.com/foo/bar.git

$gitsubmoduleupdate--init--recursive

$gittag-d
$gitpush:refs/tags/

$gitfsck--unreachable|greptag

$gitupdate-refrefs/tags/

(master)$gitmv--forcemyfileMyFile

(master)$gitrm--cachedlog.txt

[alias]
a=add
amend=commit--amend
c=commit
ca=commit--amend
ci=commit-a
co=checkout
d=diff
dc=diff--changed
ds=diff--staged
f=fetch
loll=log--graph--decorate--pretty=oneline--abbrev-commit
m=merge
one=log--pretty=oneline
outstanding=rebase-i@{u}
s=status
unpushed=log@{u}
wc=whatchanged
wip=rebase-i@{u}
zap=fetch-p

$gitconfig--globalcredential.helpercache
##Setgittousethecredentialmemorycache

$gitconfig--globalcredential.helper'cache--timeout=3600'
##Setthecachetotimeoutafter1hour(settingisinseconds)

(master)$gitreflog
0a2e358HEAD@{0}:reset:movingtoHEAD\~2
0254ea7HEAD@{1}:checkout:movingfrom2.2tomaster
c10f740HEAD@{2}:checkout:movingfrommasterto2.2

$gitreset--hard0254ea7

https://github.com/MarkerHub/JavaIndex
-END-
如果看到这里，说明你喜欢这篇文章，请。同时标星（置顶）本公众号可以第一时间接受到博文推送。