Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » Configure upstream for push and pull
Configure upstream for push and pull [message #1822320] Wed, 04 March 2020 01:45 Go to next message
Albert Kao is currently offline Albert KaoFriend
Messages: 10
Registered: April 2016
Junior Member
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 08:29 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 1177
Registered: July 2009
Senior Member
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 12:36 Go to previous messageGo to next message
Albert Kao is currently offline Albert KaoFriend
Messages: 10
Registered: April 2016
Junior Member
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 12:39]

Report message to a moderator

Re: Configure upstream for push and pull [message #1822421 is a reply to message #1822388] Thu, 05 March 2020 20:40 Go to previous message
Thomas Wolf is currently offline Thomas WolfFriend
Messages: 373
Registered: August 2016
Senior Member
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:
  


Current Time: Sat Jun 19 16:50:32 GMT 2021

Powered by FUDForum. Page generated in 0.01600 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top