Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge
AgeCommit message (Expand)AuthorFilesLines
2022-11-13[staging] "Compare With Each Other" for unstaged filesThomas Wolf1-54/+2
2022-09-28Rename LocationEditableRevision to SymlinkEditableRevisionThomas Wolf1-2/+2
2022-09-28Fix symlink merge with stage 2 as inputThomas Wolf1-8/+15
2022-09-28[merge] Fix saving of symlinksThomas Wolf1-4/+21
2022-06-07Fixed reading config for diff or merge tool, externalized stringsSimeon Andreev1-1/+1
2022-06-03Add support for external diff and merge tools in EGitAndre Bossert1-0/+14
2022-04-03Introduce RepositoryCommitOpener to reduce duplicate codeThomas Wolf1-29/+2
2021-10-22Fix auto-completion gone wrongThomas Wolf1-1/+1
2021-09-29Generify remaining getAdapter() methodsThomas Wolf1-15/+18
2021-08-28[compare] Compare two arbitrary DiffNodesThomas Wolf4-0/+139
2021-08-28[compare] Enhance the diff viewerThomas Wolf2-16/+136
2021-08-28[history] Enable "Focus on this File" for bare repositoriesThomas Wolf3-6/+99
2021-08-27[compare] Disable "Link with Editor" for multi-file comparisonsThomas Wolf2-25/+221
2021-08-27[merge] Fix label when input from stage 2 is savedThomas Wolf3-2/+78
2021-08-27[compare] Comparing the working tree with a commitThomas Wolf3-19/+103
2021-08-27[compare] Refactor GitCompareEditorInputThomas Wolf5-404/+345
2021-08-27[merge] Use a compact tree for the directory structureThomas Wolf2-18/+108
2021-07-14Change singletons to enumeration literalsThomas Wolf3-5/+4
2021-06-16[merge] Internal refactoring: introduce AbstractGitMergeEditorInputThomas Wolf2-423/+732
2021-06-16[merge] Enable overlays for DiffNodesThomas Wolf1-2/+2
2021-06-01[merge] Hide changes between ancestor and current for cherry-pickThomas Wolf4-3/+440
2021-06-01[merge] Use working tree filtered to 'ours' as input for conflictsThomas Wolf3-19/+197
2021-06-01[merge] Refactor choosing between working tree and stage 2Thomas Wolf3-17/+71
2021-06-01[merge] Use EFS-linked IResources for non-workspace filesThomas Wolf1-63/+156
2021-06-01[merge] Detect conflicting files underneath ignored foldersThomas Wolf1-19/+11
2021-06-01[merge] Fix base for cherry-picks and rebasesThomas Wolf1-26/+61
2021-06-01[merge] Record in index whether conflicting file has been updatedThomas Wolf1-5/+52
2021-05-19API: RevUtils and factory methods for IFileRevisionsThomas Wolf1-2/+2
2021-04-03Unify determining the "theirs" commitThomas Wolf1-40/+3
2021-03-11[osgi] Disperse the EGit core Activator into OSGi dynamic servicesThomas Wolf2-3/+4
2020-04-14Use REVERT_HEAD for comparing a revert conflictThomas Wolf1-6/+13
2019-09-09Fix saving in the merge editorThomas Wolf1-0/+49
2019-03-18Unify duplicate checkout conflicts dialogsThomas Wolf1-4/+8
2019-03-04Prevent NPE in MergeResultDialogThomas Wolf1-2/+5
2019-02-17Make merge viewers react better on outside changesThomas Wolf1-38/+48
2019-02-02Use PathFilterGroup where possible instead of or-ed PathFiltersThomas Wolf2-26/+20
2018-12-29Open compare editor in backgroundMichael Keppler1-0/+5
2018-11-21Refactoring: Moved refName validation method to core for better re-useMax Hohenegger1-2/+3
2018-10-05Fix Findbugs WMI_WRONG_MAP_ITERATORMichael Keppler1-3/+5
2018-08-13Use multi-line text fields for merge and rebase result dialogsThomas Wolf1-1/+1
2018-08-13refactor: simplify collection.toArray()Michael Keppler2-2/+2
2018-05-29Update license to EPL-2.0Matthias Sohn4-8/+16
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

Back to the top