Differences

This shows you the differences between two versions of the page.

--- linux:git [2025/12/11 10:13] – [Check out remote branch] v1ctor
+++ linux:git [2026/02/13 18:52] (current) – [SQUASH] v1ctor
@@ Line 8: / Line 8: @@
                                       // 3. Move your working directory to that branch
 </code>
+---------------
 ==== DELETE REMOTE BRANCH ====
@@ Line 21: / Line 21: @@
 git push origin --delete <branch-name>
 </code>
+---------------
 ==== ACCIDENTALLY COMITED ON MASTER ====
@@ Line 44: / Line 45: @@
 git log --oneline master
 </code>
+---------------
+==== SQUASH ====
+Scenario - you would like to "squash" several commits in your branch before submitting the merge request, so that all your changes look like a single commit.
+**Step 1** - Find the **base commit** where your branch diverged from main
+<code bash>
+git merge-base master HEAD
+</code>
+**Step 2** - Start interactive rebase from that commit:
+<code bash>
+git rebase -i abc123
+</code>
+**Step 3** - In editor which will open, change all but the first pick to squash or just s:
+<code bash>
+pick abc123 My first commit
+squash def456 My second commit
+squash ghi789 My third commit
+</code>
+**Step 4** - Editor will open again for a commit message. Edit as you wish.
+**Step 5** - Push with force:
+<code bash>
+git push --force
+</code>
+**Step 6** - When trying to pull after these changes, you might need to rebase:
+<code>
+git config pull.rebase true
+git pull
+</code>
+==== CHANGE COMMIT MESSAGE ====
+If the commit has been already pushed to the upstream, and it's the latest commit:
+<code bash>
+git commit --amend # edit the commit msg
+git push --force
+</code>