Git: Using Advanced Rebase Features for a Clean Repository

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

git rebase -i on a master with no changes.

As a sole developer, I am pulled in two different directions when using git feature-branch style. I want to make sure I never lose my work so I check in frequently- any time I start a change that might ultimately fail, I commit my current code so I can recover it. But I also want a clean, concise and useful history.

After reading this article I tried 'git rebase -i master' on my feature branch even though the master had no changes since starting the feature branch. This seems to work and allows me clean up my feature branch before I merge it to master.

Is there a better way to do this or are there problems with this?

[ Parent | on HN ]

Re:Git: Using Advanced Rebase Features for a Clean Repository by AstralStorm on Wednesday August 09, 2017 @01:39PM (#14971654)

The only potential problem is that you should instead run git fetch -u and rebase onto origin/master instead. (By default your rebase will use the remote anyway, but won't fetch for you.)

[ Parent | on HN ]

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

There is no problem with this approach! The blogpost also contains a video which explains how to use rebase in sample use-cases.

[ Parent | on HN ]