Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge
AgeCommit message (Expand)AuthorFilesLines
2018-05-05Respect gitattributes in the compare editorThomas Wolf1-5/+23
2018-05-04Silence all "unused object" warningsMichael Keppler2-0/+2
2016-04-20Remove redundant type information from org.eclipse.egit.uiLars Vogel3-9/+9
2016-02-25Fix recognition of submodules in folders.Thomas Wolf1-2/+1
2015-12-23[performance] Remove ContainerTreeIterator and AdaptableFileTreeIteratorAndrey Loskutov1-4/+2
2015-10-10[nested projects] Allow EGit request inner most projects in some casesAndrey Loskutov1-1/+1
2015-07-07Always supply repository to the compare inputAndrey Loskutov1-1/+4
2015-06-23Null-annotated RepositoryMapping, ResourceUtils & SelectionUtilsAndrey Loskutov1-0/+5
2015-05-21Use try-with-resource to avoid leaks with RevWalk and TreeWalkMatthias Sohn2-74/+75
2015-03-24Add missing @Override annotations to org.eclipse.egit.uiLars Vogel1-0/+11
2015-03-15Avoid blinking cursor in merge result dialogMichael Keppler1-1/+1
2015-03-05Fix SWTException: invalid thread accessMatthias Sohn1-1/+7
2015-03-02Replace deprecated ObjectReader.release()Matthias Sohn1-1/+1
2015-03-02Replace use of deprecated TreeWalk.release()Matthias Sohn2-39/+33
2014-09-16Remove use of alternating row colors in some more placesRobin Stocker1-3/+0
2014-09-01Enable linking with merge tool inputRobin Stocker1-2/+19
2014-08-11Clean up titles used in compare viewsRobin Stocker1-4/+8
2014-07-07Move revision classes into new packageRobin Stocker2-7/+7
2013-12-09Make Merge Tool work for non-workspace filesRobin Stocker1-37/+64
2013-10-22Only show "New HEAD" in merge result dialog when applicableRobin Stocker1-3/+6
2013-09-25Add nice labels for merge/rebase result statusRobin Stocker1-2/+36
2013-04-25Try to find the most nested resource path instead of any with merge toolRobin Rosenberg1-6/+4
2013-03-07Move UIText and UIIcons to the internal packageRobin Rosenberg4-4/+4
2013-02-16rightCommit param in GitMergeEditorInput#buildDiffContainer is unusedTomasz Zarna1-2/+2
2013-01-31Gracefully ignore linked resourcesFrançois Rey1-2/+2
2013-01-23Make Merge Tool also usable for conflicts of unstashingRobin Stocker1-7/+12
2013-01-20Properly handle checkout conflict exceptionsMarkus Duft1-0/+14
2013-01-05Show reason for failure in MergeResultDialogRobin Rosenberg1-12/+49
2012-12-19Suggest HEAD version in the MergeTool dialogRobin Rosenberg1-1/+2
2012-11-09Abbreviate commit ID in merge editor labelsRobin Stocker1-4/+4
2012-08-20Don't activate editors in single-click modeDani Megert1-9/+21
2012-08-06[historyView] Fix NPE in GitCompareEditorInput#equalsRobin Stocker1-1/+1
2012-06-24[historyView] Use resource encoding for compare editor nodesRobin Stocker1-25/+33
2012-04-05Fix diff icons and left/right sides in History View compareRobin Stocker1-5/+5
2011-12-01Refactor anonymous subclasses of EditableRevision into FileEditableRevisionRobin Stocker1-31/+7
2011-11-07Do not create a filter for empty string pathsRemy Suen1-5/+9
2011-10-30Do not set a filter if an empty string is presentRemy Suen1-3/+6
2011-08-01Persist bounds of fetch/merge/push/pull dialogs.Kevin Sawicki1-0/+6
2011-07-09Add more information to merge and fetch results dialogs.Kevin Sawicki1-39/+45
2011-06-13Fix title of merge result dialog to use correct textMatthias Sohn1-1/+1
2011-05-18Support opening commit viewer from result dialogs.Kevin Sawicki1-0/+27
2011-04-06Enable cherry-pick conflict resolutionRobin Stocker1-0/+2
2011-02-03Add "quick" compare and use it in history view by defaultMathias Kinzler1-0/+459
2011-02-03Merge tool: skip ignored resources when building the diffMathias Kinzler1-13/+22
2011-02-02MergeTool: build input using a TreeWalk for better performanceMathias Kinzler1-253/+237
2010-12-09Add Skip and Continue to Rebase menuMathias Kinzler1-0/+18
2010-10-29Integration of a merge toolMathias Kinzler2-0/+522
2010-10-13Add "Pull" action to Team menuMathias Kinzler1-8/+12
2010-09-06Implement dialog to display a merge resultJens Baumgart1-0/+206

    Back to the top