Git: Using Advanced Rebase Features for a Clean Repository

Re:Git: Using Advanced Rebase Features for a Clean Repository by neebz on Wednesday August 09, 2017 @07:58AM (#14967673)

Does this work even we keep pushing commits on a remote repository?

We extensively use Github Pull Requests for code reviews and most of the time we squash our PRs into a single commit but I would love to have a way to merge into multiple smaller squashed commits (as OP did) instead of one big.

[ Parent | on HN ]

Re:Git: Using Advanced Rebase Features for a Clean Repository by branja on Wednesday August 09, 2017 @08:08AM (#14967739)

Try interactive rebase. https://robots.thoughtbot.com/git-interactive-rebase-squash-...

[ Parent | on HN ]

Re:Git: Using Advanced Rebase Features for a Clean Repository by pkamb on Wednesday August 09, 2017 @02:52PM (#14972414)

The Interactive Rebase tool in SourceTree is very good and understandable/usable. I use it all the time to squash some commits, leave others.

[ Parent | on HN ]

Re:Git: Using Advanced Rebase Features for a Clean Repository by mtyurt on Wednesday August 09, 2017 @10:52AM (#14969591)

You can watch the video, it shows examples of rebase with feature branches.

[ Parent | on HN ]