Menu
When I choose "update from master", it creates a merge commit. I'd rather just have it re-base. Is this possible?
924
To rebase, make sure you have all the commits you want in the rebase in your master branch. Check out the branch you want to rebase and type git rebase master (where master is the branch you want to rebase on).
In git-gui : Go to Tools -> Add and then enter a custom command i.e. git rebase master . Select Add globally to have this option appear for all repositories.
To rebase a branch, checkout the branch and then rebase it on top of another branch. Important: After the rebase, the applied commits will have a different hash. You should not rebase commits you have already pushed to a remote host.
It does not appear that feature is currently included in GitHub desktop. What I normally do is click on the repository name in the drop-down menu in the top left and then click on "open in terminal". Then just follow the instructions here.
If you add this to your .gitconfig, GitHub desktop should rebase according to here.
[pull]
rebase = true
GitHub desktop 2.0 now supports rebasing built in! It is under the branch section of the top menu or you can use the shortcut ⇧⌘E
82
As @Taraz commented on the question, GitHub Desktop now has the option built in.
Branch > Rebase current branch
It's below the Update from master option
6
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
