在 github 中的拉取请求之前，将所有提交压缩为一个

Question

我需要将我的所有提交放在一个称为初始快照的单个快照中，以便在 github 存储库中发布它，我知道为此我遵循 this

我的第一个问题是我想与外部存储库共享它，这说：

请注意：仅对尚未推送的提交执行此操作 外部存储库。如果其他人基于提交的工作 你要删除，可能会发生很多冲突。只是不要 如果您的历史已与他人共享，请改写它。

我想把我所有的提交放在一个单一的，怎么做：

我也发现了这个：

# Switch to the master branch and make sure you are up to date.
git checkout master
git fetch # this may be necessary (depending on your git config) to receive updates on origin/master
git pull

# Merge the feature branch into the master branch.
git merge feature_branch

# Reset the master branch to origin's state.
git reset origin/master

# Git now considers all changes as unstaged changes.
# We can add these changes as one commit.
# Adding . will also add untracked files.
git add --all
git commit

但什么也没发生：

$ git reset  origin/master
$ git add --all
$ git commit -m "initial snapshot"
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean

Answer 1

最简单的方法是使用rebase 命令。

假设你有这个存储库：

$> git log --oneline
af28aeb Another test
a680317 Try something
d93792b Edit both files
f23cdbd Second commit add b
6f456bc First commit add a

所以您已经对提交af28aeb Another test 和a680317 Try something 进行了一些测试。我们想在d93792b Edit both files 之后压缩它们以清理存储库。

为此，命令将是 git rebase -i d93792b

其中-i 表示进入交互模式，d93792b 是我们要吸收前一个的提交哈希。

注意：如果你想像第一个一样压缩所有提交，你必须使用git rebase --root -i

该命令会告诉你：

pick a680317 Try something
pick af28aeb Another test

# Rebase d93792b..af28aeb onto d93792b (       2 TODO item(s))
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

你必须告诉 rebase 命令你想做什么。在这种情况下，我建议您改写第一个提交并压缩第二个提交，如下所示：

reword a680317 Try something
squash af28aeb Another test

# Rebase d93792b..af28aeb onto d93792b (       2 TODO item(s))
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

然后您的文本编辑将打开以设置新的提交消息。

Fix bug

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date:      Tue Jul 28 08:40:04 2015 +0200
#
# rebase in progress; onto d93792b
# You are currently editing a commit while rebasing branch 'master' on 'd93792b'.
#
# Changes to be committed:
#       new file:   c
#

现在您必须git commit --amend 和git rebase --continue 才能完成该过程。

您的存储库将显示如下：

$> git log --oneline
5f98806 Fix bug
d93792b Edit both files
f23cdbd Second commit add b
6f456bc First commit add a