Re: [egit-dev] Pull vs. Rebase

[Matthias Sohn <matthias.sohn@xxxxxxxxxxxxxx>]

2011/5/12 James Blackburn <jamesblackburn@xxxxxxxxx>

On 12 May 2011 08:05, Swindells, Thomas <TSwindells@xxxxxxx> wrote:

That certainly looked a good plan to me, as does adding support for the branch.autosetuprebase config option.

Great. Thanks all for the detail. I've filed:

https://bugs.eclipse.org/bugs/show_bug.cgi?id=345536  - add support for branch.autosetuprebase option (not sure if this is an egit / jgit feature?)

Mathias told me that this is already available so I tested it successfully 

with the current nightly build. So if you want to use that for a repository

set this parameter branch.autosetuprebase to always in the repository 

configuration, if you want it for all repositories, set it in your user configuration 

located in ~/.gitconfig

I checked in egit history and found that this functionality is already available in 0.12.1.

I updated the EGit User Guide accordingly:

http://wiki.eclipse.org/EGit/User_Guide#Branch_Creation_Dialog

-- 
Matthias