| Commit message (Expand) | Author | Age | Files | Lines |
* | [checkout] Use .gitattributes from the commit to be checked out | Thomas Wolf | 2022-03-07 | 1 | -39/+60 |
* | Merge conflict messages: prefix conflict lines with a hash | Thomas Wolf | 2022-01-31 | 1 | -10/+36 |
* | Remove redundant type arguments | Thomas Wolf | 2021-09-30 | 1 | -1/+1 |
* | Implement ours/theirs content conflict resolution | Thomas Wolf | 2021-04-19 | 3 | -45/+204 |
* | Allow file mode conflicts in virtual base commit on recursive merge. | Marija Savtchouk | 2021-04-06 | 1 | -9/+12 |
* | Allow dir/file conflicts in virtual base commit on recursive merge. | Marija Savtchouk | 2021-02-09 | 1 | -10/+13 |
* | ResolveMerger: do not content-merge gitlinks on del/mod conflicts | Demetr Starshov | 2020-08-26 | 1 | -28/+44 |
* | ResolveMerger: choose OURS on gitlink when ignoreConflicts | Demetr Starshov | 2020-08-26 | 1 | -9/+11 |
* | ResolveMerger: improving content merge readability | Demetr Starshov | 2020-08-26 | 1 | -12/+14 |
* | ResolveMerger: extracting createGitLinksMergeResult method | Demetr Starshov | 2020-08-26 | 1 | -8/+14 |
* | ResolveMerger: Ignore merge conflicts if asked so | Ivan Frade | 2020-03-19 | 1 | -16/+26 |
* | Merge branch 'stable-5.6' | Matthias Sohn | 2020-02-28 | 1 | -1/+1 |
|\ |
|
| * | Move array designators from the variable to the type | David Pursehouse | 2020-02-27 | 1 | -1/+1 |
* | | Merge branch 'stable-5.6' | Matthias Sohn | 2020-02-22 | 1 | -1/+1 |
|\| |
|
| * | Reorder modifiers to follow Java Language Specification | David Pursehouse | 2020-02-19 | 1 | -1/+1 |
* | | Update EDL 1.0 license headers to new short SPDX compliant format | Matthias Sohn | 2020-01-04 | 18 | -684/+90 |
|/ |
|
* | Enable and fix "Statement unnecessarily nested within else clause" warnings | David Pursehouse | 2019-10-17 | 4 | -62/+59 |
* | MergeAlgorithm: Suppress Error Prone warning about reference equality | David Pursehouse | 2019-08-08 | 1 | -1/+6 |
* | Merge branch 'stable-5.3' into stable-5.4 | Matthias Sohn | 2019-08-08 | 1 | -21/+24 |
|\ |
|
| * | Merge branch 'stable-5.2' into stable-5.3 | Matthias Sohn | 2019-08-08 | 1 | -21/+24 |
| |\ |
|
| | * | Merge branch 'stable-5.1' into stable-5.2 | Matthias Sohn | 2019-08-08 | 1 | -21/+24 |
| | |\ |
|
| | | * | Use Instant instead of milliseconds for filesystem timestamp handling | Matthias Sohn | 2019-07-18 | 1 | -21/+24 |
* | | | | Consistently use "!isEmpty()" to detect non-empty list | David Pursehouse | 2019-06-07 | 1 | -1/+1 |
* | | | | Use isEmpty() instead of size()==0 where possible | Carsten Hammer | 2019-04-13 | 1 | -1/+1 |
|/ / / |
|
* | | | ResolveMerger: Destroy TemporaryBuffer on unchecked exceptions | Dave Borowitz | 2019-03-01 | 1 | -3/+6 |
* | | | Avoid double words | Mincong HUANG | 2018-12-21 | 1 | -1/+1 |
|/ / |
|
* | | MergeFormatterPass: Remove constructor taking charset name as string | Jonathan Nieder | 2018-09-30 | 2 | -26/+1 |
* | | MergeFormatter{Pass}: Use Charset instead of String | David Pursehouse | 2018-09-30 | 3 | -10/+116 |
|/ |
|
* | Fix ResolveMerger: rebase with autocrlf=true, direct checkout | Thomas Wolf | 2018-08-13 | 1 | -17/+105 |
* | ResolveMerger: don't try needlessly to delete directories | Thomas Wolf | 2018-07-19 | 1 | -5/+9 |
* | Merge branch 'stable-4.11' into stable-5.0 | David Pursehouse | 2018-07-04 | 1 | -1/+1 |
|\ |
|
| * | Merge branch 'stable-4.10' into stable-4.11 | David Pursehouse | 2018-07-04 | 1 | -1/+1 |
| |\ |
|
| | * | Merge branch 'stable-4.9' into stable-4.10 | David Pursehouse | 2018-07-04 | 1 | -1/+1 |
| | |\ |
|
| | | * | Merge branch 'stable-4.8' into stable-4.9 | David Pursehouse | 2018-07-04 | 1 | -1/+1 |
| | | |\ |
|
| | | | * | Merge branch 'stable-4.7' into stable-4.8 | David Pursehouse | 2018-07-04 | 1 | -1/+1 |
| | | | |\ |
|
| | | | | * | ResolveMerger: Fix encoding with string; use bytes | Marco Miller | 2018-06-21 | 1 | -1/+1 |
* | | | | | | Remove further unnecessary 'final' keywords | Han-Wen Nienhuys | 2018-05-18 | 1 | -2/+2 |
* | | | | | | Remove 'final' in parameter lists | Han-Wen Nienhuys | 2018-05-15 | 6 | -22/+22 |
* | | | | | | Remove deprecated ResolveMerger#processEntry method | Matthias Sohn | 2018-03-10 | 1 | -55/+0 |
|/ / / / / |
|
* | | | | | LFS: support merge/rebase/cherry-pick/diff/compare with LFS files | Markus Duft | 2018-03-03 | 1 | -18/+37 |
* | | | | | Basic submodule merge handling | David Turner | 2018-02-04 | 1 | -6/+37 |
* | | | | | Use a TemporaryBuffer to do a content merge | Thomas Wolf | 2018-02-02 | 1 | -84/+48 |
* | | | | | Fix index blob for merges with CRLF translations | Thomas Wolf | 2018-02-02 | 1 | -5/+43 |
* | | | | | Honor CRLF settings when writing merge results | Thomas Wolf | 2018-02-02 | 1 | -5/+23 |
|/ / / / |
|
* | | | | Fix javadoc in org.eclipse.jgit merge package | Matthias Sohn | 2017-12-19 | 16 | -105/+209 |
* | | | | Merge branch 'stable-4.9' | Matthias Sohn | 2017-11-11 | 1 | -0/+56 |
|\| | | |
|
| * | | | Reintroduce protected method which removal broke EMF Compare | Matthias Sohn | 2017-10-24 | 1 | -0/+56 |
* | | | | Avoid loading and merging binary data in ResolveMerger | Han-Wen Nienhuys | 2017-10-24 | 1 | -7/+23 |
|/ / / |
|
* | | | Add missing newlines at ends of Java files | David Pursehouse | 2017-07-25 | 1 | -1/+1 |
* | | | Make 'inCoreLimit' of LocalFile used in ResolveMerger configurable | Changcheng Xiao | 2017-07-22 | 1 | -2/+16 |