Eclipse Community Forums: EGit / JGit » Configure upstream for push and pull

Home » Eclipse Projects » EGit / JGit » Configure upstream for push and pull

Configure upstream for push and pull [message #1822320]

Tue, 03 March 2020 20:45

Eclipse User

Creating a branch will get the "Configure upstream for push and pull" checkbox, and in the "When pulling" listbox, do I select "Merge" option?
The other entries are "Rebase", "Rebase preserving merge commits", "Rebase interactively".
Our git workflow is: create a feature branch from master.
Nobody else will commit to my branch.

Re: Configure upstream for push and pull [message #1822333 is a reply to message #1822320]

Wed, 04 March 2020 03:29

Eclipse User

I don't understand what's you question. Can you rephrase it ?

Re: Configure upstream for push and pull [message #1822388 is a reply to message #1822320]

Thu, 05 March 2020 07:36

Eclipse User

Creating a branch will use the "Configure upstream for push and pull", "When pulling" menu.
Which option to use out of the 4 options?
The options are "Merge", "Rebase", "Rebase preserving merge commits", "Rebase interactively".

[Updated on: Thu, 05 March 2020 07:39] by Moderator

Re: Configure upstream for push and pull [message #1822421 is a reply to message #1822388]

Thu, 05 March 2020 15:40

Eclipse User

The options correspond to the git config option branch.<name>.rebase with possible values "false", "true", "preserve" or "merges", and "interactive".

Which one you want to use is up to you. Personally I use "rebase" globally via config option "pull.rebase = true".

Previous Topic:	Unable to install eGit with RDI Version: 9.6.0.6
Next Topic:	Problem checking out HEAD after fetch

Goto Forum:

-=] Back to Top [=-

Current Time: Tue Aug 05 19:59:34 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter