Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 429664

Summary: Support for --preserve-merges in git pull with rebase
Product: [Technology] JGit Reporter: T3rm1 <T3rm1>
Component: JGitAssignee: Project Inbox <jgit.core-inbox>
Status: RESOLVED FIXED QA Contact:
Severity: enhancement    
Priority: P3 CC: robin.rosenberg, robin, swamblumat-eclipsebugs
Version: 3.3Keywords: helpwanted
Target Milestone: 3.5   
Hardware: PC   
OS: Windows 7   
Whiteboard:
Bug Depends on: 439421    
Bug Blocks:    

Description T3rm1 CLA 2014-03-05 08:39:43 EST 
Hi,
we are working with a lot of people on one branch and use the rebase strategy for git pull so that the history doesn't get too complicated.
We also work with feature branches which eventually get merged back into our main develop branch. Before we push the merge we need some time to test the integration. During that time it's very likely that someone else has pushed his commits to the branch.
If we do a pull now with rebase checked all the commits are dublicated. Git is able to avoid this by setting the property pull.rebase = preserve.

Please add support for this. It's really annoying to change the pull strategy for a branch each time we merge a branch and want to push the changes.

See http://stackoverflow.com/questions/11863785/make-git-pull-rebase-preserve-merge-commits for a better explanation what --preserve-merges does.
Comment 1 Konrad Kügler CLA 2014-07-11 06:36:18 EDT 
I also miss this feature and proposed an implementation at https://git.eclipse.org/r/#/c/29771/
Comment 2 Robin Rosenberg CLA 2014-07-15 20:03:18 EDT 
Merged