Is there a way to make GitHub Desktop rebase a branch against master?

github-for-mac
Kushal Dave picture Kushal Dave · May 28, 2016 · Viewed 14.5k times · Source

When I choose "update from master", it creates a merge commit. I'd rather just have it re-base. Is this possible?

Answer

Liam R picture Liam R · Feb 27, 2018

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.

Update:

If you add this to your .gitconfig, GitHub desktop should rebase according to here.

[pull]
    rebase = true

Second Update:

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

Related questions

GitHub "fatal: remote origin already exists"

I am trying to follow along Michael Hartl's Rails tutorial but I've run across an error. I signed up on Github and issued a new SSH key and made a new repository. But when I enter the next line into …

Read More
"did you run git update-server-info" error on a Github repository

I'm using the github Gui from their website to manage my repos, and I'm getting the following error: fatal: https://github.com/TeaCodie/TeaCodie-Website.git/info/refs not found: did you run git update-server-info on the server? How can I …

Read More
How to solve git merge error "Swap file .MERGE_MSG.swp already exists"

When I pull: E325: ATTENTION Found a swap file by the name "~/Documents/Sites/recipegenerator/.git/.MERGE_MSG.swp" owned by: username dated: Wed Dec 14 12:28:45 2016 file name: ~username/Documents/Sites/recipegenerator/.git/MERGE_MSG modified: YES user name: username host …

Read More