aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable-7.0' into stable-7.1Matthias Sohn2024-12-061-3/+6
|\
| * Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-12-061-3/+6
| |\
| | * Fix potential NPE in ResolveMerger#getAttributesContentMergeStrategyMatthias Sohn2024-12-051-3/+6
* | | RecursiveMerger: fix boxing warningMatthias Sohn2024-11-191-1/+1
* | | Suppress non-externalized string warningsMatthias Sohn2024-11-191-3/+3
* | | Merge branch 'stable-7.0' into stable-7.1Matthias Sohn2024-11-053-4/+57
|\| |
| * | Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-11-053-4/+57
| |\|
| | * ResolveMerger: Allow setting the TreeWalk AttributesNodeProviderNasser Grainawi2024-11-051-0/+23
| | * Add Union merge strategy supportNasser Grainawi2024-11-043-4/+34
* | | RevolveMerger: honor ignoreConflicts also for binary filesKamil Musin2024-10-081-2/+15
* | | Record failing paths in recursive merge.jackdt@google.com2024-09-231-2/+19
|/ /
* | Remove deprecated MergeMessageFormatter#formatWithConflictsMatthias Sohn2024-09-031-18/+0
* | Remove deprecated MergeFormatter#formatMerge using charset nameMatthias Sohn2024-09-031-31/+0
* | Remove deprecated MergeFormatter#formatMerge using charset nameMatthias Sohn2024-09-031-34/+0
|/
* [errorprone] Fix error pattern JdkObsoleteMatthias Sohn2024-04-291-3/+2
* ResolveMerger: Fix the issue with binary modify-modify conflictsSruteesh2024-04-251-30/+43
* MergeAlgorithm: Fix diff3 conflict hunk computationAntonin Delpeuch2024-04-091-2/+11
* [errorprone] Add missing javadoc summaryMatthias Sohn2023-09-252-1/+11
* Merge branch 'stable-6.6' into stable-6.7Matthias Sohn2023-09-031-22/+25
|\
| * Checkout: better directory handlingThomas Wolf2023-09-031-22/+25
* | Merge: Add diff3 style merge conflict formatter.Haamed Gheibi2023-07-314-15/+147
* | Fix all Javadoc warnings and fail on themAntoine Musso2023-06-1612-33/+41
|/
* Fix API breakage caused by extracting WorkTreeUpdaterMatthias Sohn2022-11-152-636/+612
* [merge] Fix merge conflicts with symlinksThomas Wolf2022-09-071-53/+115
* Move WorkTreeUpdater to merge packageHan-Wen Nienhuys2022-09-062-1/+635
* WorkTreeUpdater: use DirCacheCheckout#StreamSupplierHan-Wen Nienhuys2022-09-061-4/+1
* WorkTreeUpdater: remove safeWrite optionHan-Wen Nienhuys2022-09-061-1/+1
* WorkTreeUpdater#Result: hide data membersHan-Wen Nienhuys2022-08-231-4/+4
* Fix API errors caused by 23a71696cdMatthias Sohn2022-08-121-0/+2
* Reapply "Create util class for work tree updating in both filesystem and index."Nitzan Gur-Furman2022-08-082-362/+156
* Revert "Create util class for work tree updating in both filesystem and index."Jonathan Nieder2022-08-052-154/+361
* Create util class for work tree updating in both filesystem and index.Nitzan Gur-Furman2022-07-252-361/+154
* [checkout] Use .gitattributes from the commit to be checked outThomas Wolf2022-03-071-39/+60
* Merge conflict messages: prefix conflict lines with a hashThomas Wolf2022-01-311-10/+36
* Remove redundant type argumentsThomas Wolf2021-09-301-1/+1
* Implement ours/theirs content conflict resolutionThomas Wolf2021-04-193-45/+204
* Allow file mode conflicts in virtual base commit on recursive merge.Marija Savtchouk2021-04-061-9/+12
* Allow dir/file conflicts in virtual base commit on recursive merge.Marija Savtchouk2021-02-091-10/+13
* ResolveMerger: do not content-merge gitlinks on del/mod conflictsDemetr Starshov2020-08-261-28/+44
* ResolveMerger: choose OURS on gitlink when ignoreConflictsDemetr Starshov2020-08-261-9/+11
* ResolveMerger: improving content merge readabilityDemetr Starshov2020-08-261-12/+14
* ResolveMerger: extracting createGitLinksMergeResult methodDemetr Starshov2020-08-261-8/+14
* ResolveMerger: Ignore merge conflicts if asked soIvan Frade2020-03-191-16/+26
* Merge branch 'stable-5.6'Matthias Sohn2020-02-281-1/+1
|\
| * Move array designators from the variable to the typeDavid Pursehouse2020-02-271-1/+1
* | Merge branch 'stable-5.6'Matthias Sohn2020-02-221-1/+1
|\|
| * Reorder modifiers to follow Java Language SpecificationDavid Pursehouse2020-02-191-1/+1
* | Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-0418-684/+90
|/
* Enable and fix "Statement unnecessarily nested within else clause" warningsDavid Pursehouse2019-10-174-62/+59
* MergeAlgorithm: Suppress Error Prone warning about reference equalityDavid Pursehouse2019-08-081-1/+6
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-05 14:07:08 +0000