oliverdavies.uk/content/node.b2c3f5ed-2db6-46da-a532-b1e9beb9f1d0.yml

58 lines
2.5 KiB
YAML

uuid:
- value: b2c3f5ed-2db6-46da-a532-b1e9beb9f1d0
langcode:
- value: en
type:
- target_id: daily_email
target_type: node_type
target_uuid: 8bde1f2f-eef9-4f2d-ae9c-96921f8193d7
revision_timestamp:
- value: '2025-06-10T20:13:18+00:00'
revision_uid:
- target_type: user
target_uuid: b8966985-d4b2-42a7-a319-2e94ccfbb849
revision_log: { }
status:
- value: true
uid:
- target_type: user
target_uuid: b8966985-d4b2-42a7-a319-2e94ccfbb849
title:
- value: 'Easily amend commits with git-instafix '
created:
- value: '2025-06-10T19:59:46+00:00'
changed:
- value: '2025-06-10T20:13:18+00:00'
promote:
- value: false
sticky:
- value: false
default_langcode:
- value: true
revision_translation_affected:
- value: true
path:
- alias: /daily/2025/06/10/easily-amend-commits-git-instafix
langcode: en
body:
- value: |-
How often do you make commits to a Git branch to later realise that you need to amend one of your unpushed commits?
A simple `git commit --amend` will only work on the most recent commit, so that won't work if you've added more commits after the one you want to amend.
You can make a temporary commit, rebase your branch and squash the temporary commit into the original one.
Or you can use [git-instafix][0] - a tool for easily fixing and amending old commits.
Instead of making a temporary commit, running `git-instafix` will show your unpushed commits - allowing you to select one and it will amend it for you in a single step, making it easier to keep your Git commit history cleaner and easier to read and review.
[0]: https://github.com/quodlibetor/git-instafix
format: markdown
processed: |
<p>How often do you make commits to a Git branch to later realise that you need to amend one of your unpushed commits?</p>
<p>A simple <code>git commit --amend</code> will only work on the most recent commit, so that won't work if you've added more commits after the one you want to amend.</p>
<p>You can make a temporary commit, rebase your branch and squash the temporary commit into the original one.</p>
<p>Or you can use <a href="https://github.com/quodlibetor/git-instafix">git-instafix</a> - a tool for easily fixing and amending old commits.</p>
<p>Instead of making a temporary commit, running <code>git-instafix</code> will show your unpushed commits - allowing you to select one and it will amend it for you in a single step, making it easier to keep your Git commit history cleaner and easier to read and review.</p>
summary: ''
field_daily_email_cta: { }