vault backup: 2025-03-20 11:07:48

1 files changed, 22 insertions, 0 deletions

diff --git a/3 Resources/Git/Edit existing commits.md b/3 Resources/Git/Edit existing commits.md
new file mode 100644
index 0000000..9832ee5
--- /dev/null
+++ b/3 Resources/Git/Edit existing commits.md
@@ -0,0 +1,22 @@
+---
+tags:
+  - git
+---
+I've found a nice and easy way to edit existing commits. Before I used the following "tedious" process.
+```
+git stash # Git rebase wants a clean working tree
+git rebase -i <main|master|whatever branch your branched off>
+... in the interactive editor, find the commit to edit, and mark it to edit ...
+... write & quit ...
+git stash pop # Optional. Only if you've already made the changes on HEAD.
+git commit --amend
+git rebase --continue
+```
+
+Now we can do something much easier using a so called "fixup commit".
+
+```
+git commit --fixup=<commit_id_to_fix>
+git rebase -i --autosquash <main|master|whatever branch you branched off>
+... write & quit
+```
\ No newline at end of file