Bugzilla – Full Text Bug Listing
| Summary: | merge ignores --no-ff option | ||
|---|---|---|---|
| Product: | [Technology] EGit | Reporter: | Brad Cupit <bradcupit> |
| Component: | Core | Assignee: | Project Inbox <egit.core-inbox> |
| Status: | CLOSED DUPLICATE | QA Contact: | |
| Severity: | minor | ||
| Priority: | P3 | CC: | angvoz.dev, matthias.sohn, remy.suen |
| Version: | unspecified | ||
| Target Milestone: | --- | ||
| Hardware: | PC | ||
| OS: | Windows 7 | ||
| Whiteboard: | |||
this also happens when I merge from the History view (if master is the currently checked out branch, right click on the topic branch -> Merge) looks like a missing feature *** This bug has been marked as a duplicate of bug 336933 *** |
Build Identifier: 20110615-0604 in $USER_HOME/.gitconfig I have [branch "master"] mergeoptions = --no-ff however, when egit merges a topic branch into master I get a fast forward merge workaround is to reset master to last-commit-not-on-topic-branch, then merge via command line Reproducible: Always Steps to Reproduce: 1. in $USER_HOME/.gitconfig set [branch "master"] mergeoptions = --no-ff 2. create and checkout topic branch 3. make changes 4. commit to topic branch 5. checkout master 6. in egit, merge topic branch into master (in Package Explorer, right click on project -> Team -> Merge... -> select topic branch) 7. result is fast forward, even though .gitconfig says --no-ff