我推荐大卫·安德希尔的这个剧本，对我来说很有魅力。

它在natacado的filter分支中添加了这些命令来清理它留下的混乱:

rm -rf .git/refs/original/
git reflog expire --all
git gc --aggressive --prune

完整剧本(全部由大卫·安德希尔提供)

#!/bin/bash
set -o errexit

# Author: David Underhill
# Script to permanently delete files/folders from your git repository.  To use 
# it, cd to your repository's root and then run the script with a list of paths
# you want to delete, e.g., git-delete-history path1 path2

if [ $# -eq 0 ]; then
    exit 0
fi

# make sure we're at the root of git repo
if [ ! -d .git ]; then
    echo "Error: must run this script from the root of a git repository"
    exit 1
fi

# remove all paths passed as arguments from the history of the repo
files=$@
git filter-branch --index-filter \
"git rm -rf --cached --ignore-unmatch $files" HEAD

# remove the temporary history git-filter-branch
# otherwise leaves behind for a long time
rm -rf .git/refs/original/ && \
git reflog expire --all && \
git gc --aggressive --prune

最后两个命令如果改为下面的命令可能会更好:

git reflog expire --expire=now --all && \
git gc --aggressive --prune=now

Git filter-repo现在正式推荐超过Git filter-branch

在git 2.5本身的git filter-branch的手册中提到了这一点。

从git/GitHub的历史记录中删除文件夹及其内容

pip install git-filter-repo
git filter-repo --path path/to/remove1 --path path/to/remove2 --invert-paths

这将自动删除空提交。

或者你可以替换某些字符串:如何替换整个Git历史中的字符串?

git filter-repo --replace-text <(echo 'my_password==>xxxxxxxx')

如果您推送到GitHub，强制推送不够，请删除存储库或联系技术支持

即使你在一秒钟后强行推，这也不够，如下所述。

唯一有效的做法是:

泄露的是像密码一样可更改的凭证吗? 是:立即修改您的密码，并考虑使用更多的OAuth和API密钥! 不(裸照): 您是否关心存储库中的所有问题都被nuked? No:删除存储库 是的: 联络支持 如果泄漏对你来说非常重要，以至于你愿意让一些存储库停机以降低泄漏的可能性，那么在你等待GitHub支持回复你的时候，将其设置为私有

一秒钟后的推力是不够的，因为:

GitHub keeps dangling commits for a long time. GitHub staff does have the power to delete such dangling commits if you contact them however. I experienced this first hand when I uploaded all GitHub commit emails to a repo they asked me to take it down, so I did, and they did a gc. Pull requests that contain the data have to be deleted however: that repo data remained accessible up to one year after initial takedown due to this. Dangling commits can be seen either through: the commit web UI: https://github.com/cirosantilli/test-dangling/commit/53df36c09f092bbb59f2faa34eba15cd89ef8e83 (Wayback machine) the API: https://api.github.com/repos/cirosantilli/test-dangling/commits/53df36c09f092bbb59f2faa34eba15cd89ef8e83 (Wayback machine) One convenient way to get the source at that commit then is to use the download zip method, which can accept any reference, e.g.: https://github.com/cirosantilli/myrepo/archive/SHA.zip It is possible to fetch the missing SHAs either by: listing API events with type": "PushEvent". E.g. mine: https://api.github.com/users/cirosantilli/events/public (Wayback machine) more conveniently sometimes, by looking at the SHAs of pull requests that attempted to remove the content There are scrappers like http://ghtorrent.org/ and https://www.githubarchive.org/ that regularly pool GitHub data and store it elsewhere. I could not find if they scrape the actual commit diff, and that is unlikely because there would be too much data, but it is technically possible, and the NSA and friends likely have filters to archive only stuff linked to people or commits of interest.

如果你删除了存储库，而不是强制推送，提交甚至会立即从API中消失，并给出404，例如https://api.github.com/repos/cirosantilli/test-dangling-delete/commits/8c08448b5fbf0f891696819f3b2b2d653f7a3824，即使你重新创建了另一个具有相同名称的存储库，这也是有效的。

为了测试这一点，我创建了一个repo: https://github.com/cirosantilli/test-dangling，并做了:

git init
git remote add origin git@github.com:cirosantilli/test-dangling.git

touch a
git add .
git commit -m 0
git push

touch b
git add .
git commit -m 1
git push

touch c
git rm b
git add .
git commit --amend --no-edit
git push -f

参见:如何从GitHub删除悬空提交?

我推荐大卫·安德希尔的这个剧本，对我来说很有魅力。

它在natacado的filter分支中添加了这些命令来清理它留下的混乱:

rm -rf .git/refs/original/
git reflog expire --all
git gc --aggressive --prune

完整剧本(全部由大卫·安德希尔提供)

#!/bin/bash
set -o errexit

# Author: David Underhill
# Script to permanently delete files/folders from your git repository.  To use 
# it, cd to your repository's root and then run the script with a list of paths
# you want to delete, e.g., git-delete-history path1 path2

if [ $# -eq 0 ]; then
    exit 0
fi

# make sure we're at the root of git repo
if [ ! -d .git ]; then
    echo "Error: must run this script from the root of a git repository"
    exit 1
fi

# remove all paths passed as arguments from the history of the repo
files=$@
git filter-branch --index-filter \
"git rm -rf --cached --ignore-unmatch $files" HEAD

# remove the temporary history git-filter-branch
# otherwise leaves behind for a long time
rm -rf .git/refs/original/ && \
git reflog expire --all && \
git gc --aggressive --prune

最后两个命令如果改为下面的命令可能会更好:

git reflog expire --expire=now --all && \
git gc --aggressive --prune=now

For all practical purposes, the first thing you should be worried about is CHANGING YOUR PASSWORDS! It's not clear from your question whether your git repository is entirely local or whether you have a remote repository elsewhere yet; if it is remote and not secured from others you have a problem. If anyone has cloned that repository before you fix this, they'll have a copy of your passwords on their local machine, and there's no way you can force them to update to your "fixed" version with it gone from history. The only safe thing you can do is change your password to something else everywhere you've used it.

有了这些，下面是如何解决它的方法。GitHub在FAQ中回答了这个问题:

Windows用户注意:在此命令中使用双引号(")而不是单引号

git filter-branch --index-filter \
'git update-index --remove PATH-TO-YOUR-FILE-WITH-SENSITIVE-DATA' <introduction-revision-sha1>..HEAD
git push --force --verbose --dry-run
git push --force

2019年更新:

这是FAQ中的当前代码:

  git filter-branch --force --index-filter \
  "git rm --cached --ignore-unmatch PATH-TO-YOUR-FILE-WITH-SENSITIVE-DATA" \
  --prune-empty --tag-name-filter cat -- --all
  git push --force --verbose --dry-run
  git push --force

请记住，一旦您将这段代码推到GitHub等远程存储库，其他人已经克隆了该远程存储库，您现在就处于重写历史的情况下。在此之后，当其他人尝试下拉您的最新更改时，他们将收到一条消息，指示无法应用更改，因为它不是快进。

为了解决这个问题，他们必须删除现有的存储库并重新克隆它，或者遵循git-rebase手册中“从UPSTREAM REBASE中恢复”的说明。

提示:执行git rebase—交互式

将来，如果您不小心提交了一些涉及敏感信息的更改，但在推送到远程存储库之前注意到了这些更改，有一些更容易的修复方法。如果上次提交是添加敏感信息的提交，您可以简单地删除敏感信息，然后运行:

git commit -a --amend

这将使用您所做的任何新更改来修改之前的提交，包括使用git rm删除整个文件。如果更改在历史上更早，但仍然没有推送到远程存储库，您可以进行交互式rebase:

git rebase -i origin/master

这将打开一个编辑器，其中包含自与远程存储库的最后一个共同祖先以来所做的提交。在表示提交敏感信息的任何行上，将“pick”更改为“edit”，然后保存并退出。Git将遍历这些更改，并将您留在以下位置:

$EDITOR file-to-fix
git commit -a --amend
git rebase --continue

对于每个具有敏感信息的更改。最终，您将回到您的分支，并且您可以安全地推动新的更改。

它看起来是这样的:

git rm --cached /config/deploy.rb
echo /config/deploy.rb >> .gitignore

从git中删除跟踪文件的缓存，并将该文件添加到.gitignore列表中

使用filter-branch:

git filter-branch --force --index-filter 'git rm --cached --ignore-unmatch *file_path_relative_to_git_repo*' --prune-empty --tag-name-filter cat -- --all

git push origin *branch_name* -f