Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

Option to rebase instead of automatically merge when pulling from upstream

See original GitHub issue

Description

Github Desktop automatically merges upstream commits. This is fine for some projects but quickly dirties the git history with unnecessary merges. This has bitten me and colleagues multiple times in this version and the previous version of Github Desktop with the magic “Sync” button.

Proposal

Add an option in the menu to pull rebase instead of merge, or change button text to “Merge” so that I know it’s time to go to the terminal so I can pull rebase.

Version

GitHub Desktop version: 1.0.3

OS version: OSX 10.12.6

Note: I did look for similar issues on this topic but couldn’t find them.

Issue Analytics

State:
Created 6 years ago
Reactions:266
Comments:39 (20 by maintainers)

Top GitHub Comments

27reactions

siamkreativecommented, Feb 8, 2018

👍 Please consider this in your roadmap

19reactions

j-f1commented, Mar 13, 2018

Please use the 👍 button on the original issue to indicate support.

Top Results From Across the Web

Git pull --rebase vs. --merge - SDQ Wiki

This page briefly explains the difference between rebasing and merging in git while pulling. Both techniques are used to combine your local unpublished ......

When do you use Git rebase instead of Git merge?

Use merge whenever you want to add changes of a branched out branch back into the base branch. Typically, you do this by...

Merging vs. Rebasing | Atlassian Git Tutorial

By default, the git pull command performs a merge, but you can force it to integrate the remote branch with a rebase by...

Rebase by default when doing git pull (Example)

If you want git to do a rebase instead of a merge when pulling you can run git pull like this: git pull...

Why does git pull perform a merge instead of a rebase by ...

You may pull from upstream and from downstream. ... as a reason not to use rebase at all, let alone automatically do it...