"git pull --rebase" in Eclipse

Question

Our version control manager recommends us to use git pull --rebase to pull new changes from upstream branch. I want to use EGit (Eclipse plugin for git) to execute that. How can I do this?

Answer 1

You can also change the rebase configuration of a branch from within Eclipse:

1. Open the Git Repositories view and navigate to the local branch
2. Open the context menu and select Configure Branch...
3. In the resulting dialog, select the Rebase checkbox

EGit also honors the "branch.autosetuprebase" configuration when a new branch is created.

Answer 2

Use

git config branch.*branch-name*.rebase true

And pull will automatically rebase.

You can set it up to configure new branches automatically.

git config branch.autosetuprebase always