Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 351806 - Add "--squash" option to MergeCommand
Summary: Add "--squash" option to MergeCommand
Status: RESOLVED FIXED
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: 1.1   Edit
Hardware: All All
: P3 enhancement with 2 votes (vote)
Target Milestone: 2.1-M1   Edit
Assignee: Project Inbox CLA
QA Contact:
URL: https://git.eclipse.org/r/#/c/4995/
Whiteboard:
Keywords:
Depends on:
Blocks: 335091 351432
  Show dependency tree
 
Reported: 2011-07-12 05:36 EDT by Tomasz Zarna CLA
Modified: 2013-03-24 17:07 EDT (History)
5 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Tomasz Zarna CLA 2011-07-12 05:36:44 EDT 
The switch is quite common. I think the command is really missing it.
Comment 1 Matthias Sohn CLA 2011-08-10 07:45:24 EDT 
this is a request for an enhancement
Comment 2 Tomasz Zarna CLA 2012-01-23 15:56:16 EST 
On JGit Project Plan page [1] I found that for 1.3 there are few items planned: clean and evolve API, gc support [2], recursive merge support, stash support [3], submodule support [4]. These are all cool, but I was just wondering if there is any plans regarding this particular enhancement request?

[1] http://www.eclipse.org/projects/project-plan.php?projectid=technology.jgit
[2] bug 334768
[3] bug 309355, http://egit.eclipse.org/r/#change,4760
[4] bug 314853
Comment 3 Tomasz Zarna CLA 2012-01-24 19:54:28 EST 
A fix has been submitted to gerrit as http://egit.eclipse.org/r/4995 Comments are welcome.
Comment 4 Tomasz Zarna CLA 2012-04-02 05:47:33 EDT 
(In reply to comment #3)
> A fix has been submitted to gerrit as http://egit.eclipse.org/r/4995

It's https://git.eclipse.org/r/#/c/4995/ now, and again I would really appreciate any comment on the change.
Comment 5 Matthias Sohn CLA 2012-06-15 04:25:12 EDT 
merged as 2656ac1b5acb9b73c6b47e2cf8830a0a0b2cc214