Thread Rating:
  • 0 Vote(s) - 0 Average
  • 1
  • 2
  • 3
  • 4
  • 5
Git Rebase
04-12-2018, 09:50 PM, (This post was last modified: 04-12-2018, 09:56 PM by afcouling.)
RE: Git Rebase
Hi Paul,

A couple of articles worth a read:

Here's a good explanation of squashing:

Quote:Commit squashing has the benefit of keeping your git history tidy and easier to digest than the alternative created by merge commits. While merge commits retain commits like “oops missed a spot” and “maybe fix that test? [round 2]”, squashing retains the changes but omits the individual commits from history. Many people prefer this workflow because, while those work-in-progress commits are helpful when working on a feature branch, they aren’t necessarily important to retain when looking at the history of your base branch.

So squashing would be appropriate for only some PRs, when merging small/individual chunks of work.

There seems to be a strong arguement for sticking with the standard merge commits, rather than rebasing onto the base branch.

I will have a look at extracting a cleaner project history with:
git log --first-parent


Messages In This Thread
Git Rebase - by afcouling - 04-11-2018, 10:35 PM
RE: Git Rebase - by TurboPT - 04-12-2018, 10:23 AM
RE: Git Rebase - by afcouling - 04-12-2018, 09:50 PM
RE: Git Rebase - by TimSchofield - 04-12-2018, 10:41 PM
RE: Git Rebase - by afcouling - 04-13-2018, 03:02 AM

Forum Jump:

Users browsing this thread: 1 Guest(s)