Git commit: Difference between revisions

From NovaOrdis Knowledge Base
Jump to navigation Jump to search
Line 15: Line 15:


<span id='History_Rewrite'></span>
<span id='History_Rewrite'></span>
{{Warn|If the last, existing commit that has been amended was pushed in a remote repository, you will need to overwrite it in the remote repository - thus rewriting history - with:
{{Warn|If the last, existing commit that has been amended was pushed in a remote repository, you will need to overwrite it in the remote repository - thus [[Git_Concepts#Rewriting_History|rewriting history]] - with:
<syntaxhighlight lang='bash'>
<syntaxhighlight lang='bash'>
  git push --force
  git push --force

Revision as of 02:18, 31 August 2019

External

Internal

Overview

Apply Extra Changes to the Last Commit

If you are in the situation where you committed changes on your current branch, but then you worked a little bit more and want to include these latest changes into the last commit, you can use an "amend commit". This is equivalent with committing one more time and squashing the last two commits with git rebase -i HEAD~1:

git add .
git commit --amend


If the last, existing commit that has been amended was pushed in a remote repository, you will need to overwrite it in the remote repository - thus rewriting history - with:
 git push --force

This is not necessary if the last commit was not pushed yet.

Update a Commit Message that Has Not Been Pushed Yet

git commit --amend

It will start an interactive editor.

Deleting Commits from History

Deleting Commits from History