https://blogs.sumit.engineer/tags/rebase/ Recent content in Rebase on Dark Kernel Hugo -- gohugo.io en-us Mon, 29 Jul 2024 00:00:00 +0000 https://blogs.sumit.engineer/notes/2-notes/2024-07-29-add-new-change-in-previous-commit/ Mon, 29 Jul 2024 00:00:00 +0000 https://blogs.sumit.engineer/notes/2-notes/2024-07-29-add-new-change-in-previous-commit/ <ol> <li>Find the commit hash you want to edit</li> </ol> <pre tabindex="0"><code>git log </code></pre><p>[&ndash;more&ndash;]</p> <ol start="2"> <li> <p>Start interactive rebase, adjust the number if needed <code>git rebase -i HEAD~1</code></p> </li> <li> <p>In the editor, change &lsquo;pick&rsquo; to &rsquo;edit&rsquo; for the commit you want to modify</p> </li> <li> <p>Save and close the editor</p> </li> <li> <p>Add the new file</p> </li> </ol> <pre tabindex="0"><code>git add path/to/newfile </code></pre><ol start="6"> <li>Amend the commit to include the new file <code>git commit --amend</code></li> </ol> <p>Save and close the commit message editor</p> <ol start="7"> <li> <p>Continue the rebase <code>git rebase --continue</code></p> </li> <li> <p>Resolve any conflicts if necessary Force push to the remote repository if needed <code>git push --force </code></p> </li> </ol>