Differences

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

--- projects:projects [2026/07/02 08:07] – [.gitignore] jhagstrand
+++ projects:projects [2026/07/19 05:03] (current) – [End Branch] jhagstrand
@@ Line 268: / Line 268: @@
   # save work
   git checkout peaceful
+  git commit -m 'feat: new feature'
   git push origin peaceful     # push feature branch to bare repo
 ==== End Branch ====
   git checkout master
-  git merge --squash peaceful
+  #git merge --squash peaceful
+  git merge --no-ff peaceful
   git commit -m 'squashed hand-written commit message'
   git branch -D peaceful    # after squash the big -D force is required