Rebase when pulling

[simurai]

When the local repo has unpushed commits and then doing a pull, it creates a merge commit, like this one:

Should it try to rebase instead? So that the history is kept clean? I think merge commits for PRs are fine, but when just pulling from the remote, it makes it a bit messy.

One day ™️ there could be a setting. Or like in Tower, a checkbox inline:

But until then, use rebase as default?

Versions

GitHub Package Version (git --git-dir ~/.atom/packages/github/.git rev-parse head): c93a942

[smashwilson]

You can change when git pull performs a merge or a rebase with several git config settings, which this package should respect. I'd rather not override that logic if any users do have that configured manually for the CLI.

In the long term, I'd ❤️ to see a way to show and set a merge vs. rebase config within the package UI backed by those same settings, like a checkbox that sets git config branch.<branchname>.rebase true. Maybe expose pull.rebase in some kind of repository settings panel, and branch.<branchname>.rebase in a branch settings panel... ?

[simurai]

I'd rather not override that logic if any users do have that configured manually for the CLI.

I see. Yeah, that would be a bad idea. Ok, I added

[pull]
	rebase = true

to my global .gitconfig for now.

[smashwilson]

Closing to prefer the user configuration workaround 👍