编程与软件工程sethrobertson.github.io编辑精选
Git 中撤销、修复或删除提交
On undoing, fixing, or removing commits in git
2013 — 2018，它一次次回到首页
黑点是上首页（≥ 50 分）的那次投稿，空心点是没冲上去的投稿，点越大分数越高。
导读
这是一份关于在 Git 中撤销、修复或删除提交的实用指南，针对从撤销最近一次提交到从历史中彻底清除文件等多种场景，给出了分步骤的解决方案和命令示例，并提醒操作前做好备份。
为什么经久不衰：Git 历史修改是开发者长期面对的痛点，该页面系统整理了可靠的操作方法，被 IRC 频道和 Hacker News 社区多年反复推荐。
HN 评论精选
推荐用 BFG 工具做历史清理，比文中方法更简单。
最简单的方法（这篇文章略过了）：使用 BFG 2000。
fnord77查看英文原文
easiest method (this article glosses over it): use BFG 2000: https://rtyley.github.io/bfg-repo-cleaner/
个人经历：用 filter-branch 清理混合身份的历史提交。
我最近不得不重写历史。在我的职业仓库里，有一些大学时期的项目混合了我职业身份和另一个用户名的提交。最近才发现，于是用 git-filter-branch 清除了这些提交。幸好那是个长期休眠的项目。
fzeroracer查看英文原文
I had to do a bit of history rewriting not too long ago. On my professional-facing repo I had some projects from back when I was in college where I had done a mixture of commits from both my professional persona and another username. It was only recently that I noticed and so I used git-filter-branch to clear out the commits I had made. Thankfully it was a long-dormant project.
reflog 和保守 GC 让误操作可恢复，历史修改需谨慎但值得拥有。
关于丢失数据：深入 reflog 就能恢复。要从历史中删除东西，必须显式遍历提交历史并编辑每个提交。有自动化工作流（filter-branch），但没人记得住。意外修改可以用 --abort 或从 reflog 检出旧版本撤销。Git 的 GC 很保守，手动触发也要费些周折才能真正删除。某些情况下无法访问 reflog（比如远程被破坏），但仍能找回孤立对象。Git 给开发者强大工具，也带来责任。我宁愿有能力负责任地清理历史。
sisk查看英文原文
Regarding losing data: it's as simple as diving into the reflog. In order to remove something from your history, you must do so very explicitly by walking your commit history, editing each one. There is an automated workflow to accomplish that (`filter-branch`) but it's definitely not a command anyone I know has committed to memory. Accidental mutations can be undone either by `--abort`ing (if the command supports it) or by checking out an earlier revision from the reflog. The GC in git is pretty conservative and, while it can be triggered manually, still makes you jump through some hoops to actually get rid of something. Steve Klabnik wrote about it[1] a little while back. In certain cases, you don't have access to the reflog because a change wasn't made locally. Perhaps someone screwed up a remote you pull from and it destroyed your history. You can, even still, find, view, and re-associate orphaned objects. Yeah, it's not terribly intuitive and, again, not a workflow anyone has probably committed to memory, but the fact that you can recover from a disaster of that magnitude is pretty amazing. git provides we developers with a set of tools—powerful tools—and that comes with a level of responsibility. I'd rather have the ability to responsibly clean my history than the alternative. [1] - http://words.steveklabnik.com/git-history-modification-and-libuv
批评 Git 某些操作需要额外备份，反映设计缺陷。
“强烈建议备份当前工作目录和 .git，以避免因使用或误用这些说明而丢失数据。” 什么？如果版本控制系统在执行某些操作时需要备份才能避免丢数据，那它还有什么意义？我用 git，喜欢 git，但某些方面从根本上坏了。
mikeash查看英文原文
"Strongly consider taking a backup of your current working directory and .git to avoid any possibility of losing data as a result of the use or misuse of these instructions." WTF? What is the point of a version control system if you have to take backups of it to avoid losing data when performing certain operations? I use git, I like git, but certain aspects of it are fundamentally broken.
历次讨论
同类还值得读
开源应用架构
The Architecture of Open Source Applications
《开源软件架构》（AOSA）是一本在线免费书，邀请知名开源项目的作者亲自剖析其内部设计，涵盖 SQLAlchemy、LLVM、Audacity、Apache、Bash 等系统。
编程与软件工程上首页 9 次 · 2011–2024aosabook.org编辑精选编程语言简史：简短、不完整且多半错误
A Brief, Incomplete, and Mostly Wrong History of Programming Languages
一篇以戏谑、故意不准确的方式回顾编程语言史的博客文章，用夸张轶事和讽刺定义串起 Lisp、C、C++、Java、JavaScript、PHP 等语言。
编程与软件工程上首页 8 次 · 2009–2021james-iry.blogspot.comSQLite 是如何测试的
How SQLite is tested
SQLite 官方文档页，系统介绍 SQLite 的测试体系：多种测试方法（TCL 测试、模糊测试、回归测试、静态分析等）和海量测试用例，展示了这个小型开源项目如何靠极致测试获得…
编程与软件工程上首页 8 次 · 2009–2025sqlite.org编辑精选高级编程语言（2009）
Advanced programming languages (2009)
Matt Might 的经典文章，按用途推荐“高级编程语言”：如果追求就业就选主流语言，如果追求表达力、学术研究或创业，则推荐 Haskell、OCaml、Scala 等函数式语…
编程与软件工程上首页 8 次 · 2009–2022matt.might.net我的 Forth 与栈机器经历
Yosefk - My history with Forth & stack machines
作者以亲身经历回顾了使用 Forth 语言和栈式机器的历程：既赞叹其简洁优雅、代码量小、可自举的优点，也坦率指出栈操作在实际编程中的痛苦，以及 Forth 社区文化中的问题。
编程与软件工程上首页 8 次 · 2010–2024yosefk.com编辑精选