Skip to content

Add caution: don't amend pushed commits #1510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 11, 2020
Merged

Add caution: don't amend pushed commits #1510

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da5d9a3
Add caution: don't amend pushed commits
HonkingGoose Aug 29, 2020
8940a70
Merge branch 'master' into add-caution-block-about-pushing-amended-co…
HonkingGoose Sep 7, 2020
fd1a924
Change CAUTION -> NOTE
HonkingGoose Sep 7, 2020
bcbc27a
Remove comma and add link to rebase_peril
HonkingGoose Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions book/02-git-basics/sections/undoing.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ Effectively, it's as if the previous commit never happened, and it won't show up
The obvious value to amending commits is to make minor improvements to your last commit, without cluttering your repository history with commit messages of the form, ``Oops, forgot to add a file'' or ``Darn, fixing a typo in last commit''.
====

[NOTE]
====
Only amend commits that are still local and have not been pushed somewhere.
Amending previously pushed commits and force pushing the branch will cause problems for your collaborators.
For more on what happens when you do this and how to recover if you're on the receiving end read <<_rebase_peril>>.
====

[[_unstaging]]
==== Unstaging a Staged File

Expand Down