使用git rebase -i < subsequently-this-commit>,并替换“pick”在第二个和其后的“squash”或“fix”,如。

# Reset the current branch to the commit just before the last 12:
git reset --hard HEAD~12

# HEAD@{1} is where the branch was just before the previous command.
# This command sets the state of the index to be as it would just
# after a merge from that commit:
git merge --squash HEAD@{1}

# Commit those squashed changes.  The commit message will be helpfully
# prepopulated with the commit messages of all the squashed commits:
git commit

rel=“noreferer”>documentation for git mer 更详细描述了<代码>-squash备选办法。

Update: The only realvant of this means over the briefr git reset -soft HEAD~12 && git commitments proposed by Chris Johnsen in his response is that You have contributed information/

感谢。 我发现,你可以利用这一指挥来掩盖最后3项承诺:

git rebase -i HEAD~3

A practical everyday example

我最近承诺了一个新特点。 从那时起,我已承付两套保.。 但是,现在我发现,在我所承诺的新特点中,出现了一种 b(或可能只是一种拼错)。 怎么说! 我不想再作一次新的行动,对我的承诺历史进行投票!

我所做的第一件事是纠正错误,并对评论<条码>作出新的承诺,将这一条纳入我的新特点!

然后,我操作<代码>gitlog或gitk,并获取新的特征(此处为1ff9460)。

其次,我召集互动式数据库编辑<代码>git rebase-i 1ff9460~。 <代码>~ 之后,SHA告知编辑,将承诺列入编辑。

其次,我把含有固定装置(fe7f1e0)的承诺移至该特征的后面,并将<代码>pick/code>改为upfix。

在关闭编辑时,固定装置将渗入主物,我的承诺历史将看清冰和干净!

如果所有承诺都是地方性的,但如果你试图改变已经推向遥远的人们的任何承诺,就会真正给已经检查同一部门的其他发展中国家造成问题!

以。

git config --global alias.squash  !f(){ git reset --soft HEAD~${1} && git commit --edit -m"$(git log --format=%B --reverse HEAD..HEAD@{1})"; };f 

git config --global alias.squash "!f(){ git reset --soft HEAD~${1} && git commit --edit -m"$(git log --format=%B --reverse HEAD..HEAD@{1})"; };f"

[alias]
    squash = "!f(){ git reset --soft HEAD~${1} && git commit --edit -m"$(git log --format=%B --reverse HEAD..HEAD@{1})"; };f"

git squash N

git rebase -i HEAD~(n number of commits back to review)

git rebase -i HEAD~2

git add .

git rebase --continue

更多关于重写历史的这种和其他方式,见。

 git rebase -i HEAD~n

pick 01d1124 Message....
pick 6340aaa Message....
pick ebfd367 Message....
pick 30e0ccb Message....

p 01d1124 Message....
s 6340aaa Message....
s ebfd367 Message....
s 30e0ccb Message....

详情请上Link。

Here is another visual example of what would follow after executing: git rebase -i HEAD~3

Source: https://www.git-tower.com/learn/git/faq/git-squash/

If you use TortoiseGit, you can the function Combine to one commit:

1. Open TortoiseGit context menu
2. Select Show Log
3. Mark the relevant commits in the log view
4. Select Combine to one commit from the context menu

This function automatically executes all necessary single git steps. Unfortunatly only available for Windows.

很多答复是以<代码>git rebase的指令为依据的,但从我的经验来看,这一指示有些复杂,而且对于gin子来说也有些先进。

让我说,你想要 last过去3年的承诺。 然后是:

• Note down current commit id: Use git log -1 --oneline and note the commit-id of the present state (just in case you do something wrong with git reset)
• Go back 3 commits: Using git reset --soft HEAD~3 you ll go back 3 commits (and sort of forget that you ve had made these three commits earlier)
• Do a new commit: Now simply do git commit -m <NEW_SINGLE_MESSAGE> which will automatically combine the three commits under your message

如果有点燃错误的话,你可以再次通过<条码>git reset --soft <ORIGINAL_COMMIT>回到原来的状态。

以

我的“发展”分局有96项承诺(因此这些承诺没有推向遥远的人们)。

git reset origin/dev
git add --all
git commit -m  my commit message 

,Anomies accreditation/a> 是好的,但我感到对此事不安全,因此我决定添加一 couple屏幕。

Step 1: git rebase

具体如下:

$ git rebase -i 2d23ea524936e612fae1ac63c95b705db44d937d

Step 2: pick / squash what you want

就我而言,我要把首次作出的承诺推上一切。 顺序从头到最后,这正是<编码>git 日志/代码>中的其他方式。 就我而言,我想:

Step 3: Adjust message(s)

如果你只挑出一件事, rest掉其余部分,你可以调整一个承诺信息:

That s it. Once you save this (:wq), you re done. Have a look at it with git log.

我认为,这样做最容易的方式是,根据主人翁精神和做“<条码>合并——Squash

git checkout master
git checkout -b feature_branch_squashed
git merge --squash feature_branch

Then you have all of the changes ready to commit.

Procedure 1

(1) 查明承诺的短 hash

# git log --pretty=oneline --abbrev-commit
abcd1234 Update to Fix for issue B
cdababcd Fix issue B
deab3412 Fix issue A
....

www.un.org/spanish/ecosoc 也可以用来获取短 has。

(2) 如果你想qu(合并)最后两件承诺

# git rebase -i deab3412 

3) 该编码为nano的编辑。 页: 1

....
pick cdababcd Fix issue B
pick abcd1234 Update to Fix for issue B
....

4) 将<代码>pick改为squash 页: 1 在重新命名之后,它就好像如下。

....
pick cdababcd Fix issue B
squash abcd1234 Update to Fix for issue B
....

5) 现在节省并关闭<代码>nano编辑。 Press ctrl + o and press Enter to Save. 之后,报章<代码>ctrl + x 退出编辑。

然后,nano的编辑再次开放,必要时更新评论意见。

7) Now its squashed successfully, you can verify it by checking logs.

# git log --pretty=oneline --abbrev-commit
1122abcd Fix issue B
deab3412 Fix issue A
....

8) 如今,我们开始重新发起。 添加<代码>+在分支名称前签字。 这意味着强迫推进。

# git push origin +master

注: 依据的是<代码>ubuntu。 如果你使用不同的斜体(Windows/code>或Mac),那么除编辑外,上面的指令相同。 你可能会有不同的编辑。

git add <files>

git commit --fixup=OLDCOMMIT

git rebase --interactive --autosquash OLDCOMMIT^

    # git log --pretty=oneline --abbrev-commit
    cdababcd Fix issue B
    deab3412 Fix issue A
    ....
    # git add <files> # New changes
    # git commit --amend
    # git log --pretty=oneline --abbrev-commit
    1d4ab2e1 Fix issue B
    deab3412 Fix issue A
    ....  

-amend 将最新承诺的新改动合并为<代码>dababcd,并产生新的承诺编号:1d4ab2e1

Conclusion

• Advantage of 1st procedure is to squash multiple commits and to reorder. But this procedure will be difficult if we need to merge a fix to very old commit.
• So the 2nd procedure helps to merge the commit to very old commit easily.
• And the 3rd procedure is useful in a case to squash a new changes to last commit.

举例来说,如果你想要将最后3项承诺分成一个分支(即:https://bitbucket.org。

我所做的是

1. git reset --soft HEAD~3
2. git commit
3. git push origin <branch_name> --force

如果你处于一个遥远的分支(所谓的feature-branch),由金库保存(golden_repo_name),那么,这里就把你的承诺推向一个方面:

1. Checkout the golden repo

   git checkout golden_repo_name
   

2. Create a new branch from it(golden repo) as follows

   git checkout -b dev-branch
   

3. Squash与你的地方分支机构合并,你已经这样做。

   git merge --squash feature-branch
   

4. Commit your changes (this will be the only commit that goes in dev-branch)

   git commit -m "My feature complete"
   

5. 向贵处地方储存库保住处

   git push origin dev-branch
   

兑现最后10项承诺:

git reset --soft HEAD~10 && git commit -m "squashed commit"

如果你也希望更新边远处,并兑现承诺:

git push -f

任何人都提到在<>IntelliJ上做些什么容易。 IDEA UI:

• Go to git window
• Manually select all the commits you want to merge into one.
• Right-click > Squash Commits > Edit the squashed commit message
• Click on branch name on left side > Right-click > Push > Force Push

What can be really convenient:
Find the commit hash you want to squash on top of, say d43e15.

现在使用

git reset d43e15
git commit -am  new commit name 

如果你作出许多承诺,<>

<代码>git rebase -i Master, 然后发布键盘,一到编辑

你们会看到这一点:

pick etc1
pick etc2
pick etc2

改为 f 和_esc y :wq

pick etc1 //this commit will the one commit
f etc2
f etc2

指挥

git push origin +head

method 2 if you have few commits you can do this to delete a commit, you need to do same for delete your second commit and so on

git reset --soft HEAD^1 // or git reset --soft head~1
git commit --amend //then press `:wq` 
git push -f

如果你已经作出承诺,你有意再提出另一承诺,则<>方法3<>

git add files...
git commit --amend  //then press `:wq`
git push origin +head

simple solution:

www.un.org/Depts/DGACM/index_spanish.htm

www.un.org/Depts/DGACM/index_french.htm

如果你想要打上every,就承诺作出单一承诺(例如,首次公开公布项目),则试图:

git checkout --orphan <new-branch>
git commit

这是一种超高温,但是一种冷却的方式,因此,我只是把它 into入ring子:

GIT_EDITOR= f() { if [ "$(basename $1)" = "git-rebase-todo" ]; then sed -i "2,$s/pick/squash/" $1; else vim $1; fi }; f  git rebase -i foo~5 foo

翻译:提供新的“编辑”,如果要编辑的档案名称为git-rebase-todo(互动性数据库迅速)除第一个“pick”改为“squash”,否则就会引人振动——这样,当你催复时,你就会发现 s的承付信息。 (显然,我qu上了最后五项承诺,但你可以改变,不管你喜欢。)

不过,我可能做的是。

If you don t care about the commit messages of the in-between commits, you can use

git reset --mixed <commit-hash-into-which-you-want-to-squash>
git commit -a --amend

如果你重新与GiteLab合作,你就可以在Merge请求中点击Squash的选择,如下文所示。 承诺的电文为“Mege Request”。