summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
Commit message (Expand)AuthorAgeFilesLines
* JGit v6.2.0.202206071550-rv6.2.0.202206071550-rMatthias Sohn2022-06-073-4/+4
* Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2022-06-071-12/+24
|\
| * Merge branch 'stable-6.0' into stable-6.1Matthias Sohn2022-06-071-12/+24
| |\
| | * Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2022-06-071-12/+24
| | |\
| | | * Merge branch 'stable-5.12' into stable-5.13Matthias Sohn2022-06-071-12/+24
| | | |\
| | | | * Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2022-06-071-12/+24
| | | | |\
| | | | | * Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2022-06-071-12/+24
| | | | | |\
| | | | | | * Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2022-06-071-11/+23
| | | | | | |\
| | | | | | | * Fix connection leak for smart http connectionsSaša Živkov2022-06-061-11/+23
| * | | | | | | Merge branch 'stable-6.0' into stable-6.1Matthias Sohn2022-05-272-9/+27
| |\| | | | | |
| | * | | | | | Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2022-05-272-9/+27
| | |\| | | | |
| | | * | | | | Remove stray files (probes or lock files) created by background threadsJames Z.M. Gao2022-05-272-9/+27
* | | | | | | | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-06-063-4/+4
* | | | | | | | Merge branch 'master' into stable-6.2Andrey Loskutov2022-06-0317-217/+907
|\ \ \ \ \ \ \ \
| * | | | | | | | Teach JGit to handle external diff/merge tools defined in .gitattributesAndre Bossert2022-06-025-8/+191
| * | | | | | | | Adapt diff- and merge tool code for PGM and EGit usageAndre Bossert2022-06-028-224/+550
| * | | | | | | | Add availability check of pre-defined toolsAndre Bossert2022-06-0110-26/+207
* | | | | | | | | JGit v6.2.0.202206011217-rc1v6.2.0.202206011217-rc1Matthias Sohn2022-06-013-4/+4
|/ / / / / / / /
* | | | | | | | Merge "Add filtering with help of DirCacheCheckout.getContent()"Andrey Loskutov2022-05-305-134/+282
|\ \ \ \ \ \ \ \
| * | | | | | | | Add filtering with help of DirCacheCheckout.getContent()Andre Bossert2022-05-305-134/+282
* | | | | | | | | Fixed since tags added for new merge constantsAndrey Loskutov2022-05-301-4/+4
|/ / / / / / / /
* | | | | | | | Merge "Add mergetool merge feature (execute external tool)"Andrey Loskutov2022-05-274-65/+178
|\ \ \ \ \ \ \ \
| * | | | | | | | Add mergetool merge feature (execute external tool)Andre Bossert2022-05-254-65/+178
* | | | | | | | | Merge "Add command line support for "git mergetool""Andrey Loskutov2022-05-278-52/+573
|\| | | | | | | |
| * | | | | | | | Add command line support for "git mergetool"Andre Bossert2022-05-258-52/+573
* | | | | | | | | Merge "Add config reader for user-defined mergetools"Andrey Loskutov2022-05-275-4/+374
|\| | | | | | | |
| * | | | | | | | Add config reader for user-defined mergetoolsAndre Bossert2022-05-255-4/+374
* | | | | | | | | Merge "Add difftool compare feature (execute external tool)"Andrey Loskutov2022-05-277-40/+624
|\| | | | | | | |
| * | | | | | | | Add difftool compare feature (execute external tool)Andre Bossert2022-05-257-40/+624
* | | | | | | | | RewriteGenerator: Fully buffering of input is no longer necessarySimon Sohrt2022-05-254-22/+68
|/ / / / / / / /
* | | | | | | | PackFileSnapshot: Resolve warnings by using "equals" instead of "=="Fabio Ponciroli2022-05-202-1/+39
* | | | | | | | Remove stray files (probes or lock files) created by background threadsJames Z.M. Gao2022-05-152-9/+27
* | | | | | | | RefSpec: add missing @sinceThomas Wolf2022-04-251-0/+1
* | | | | | | | De-couple ServiceLoader calls from class loadingThomas Wolf2022-04-142-28/+65
* | | | | | | | CommitCommand: call GpgSigner.getDefault() only if indeed signingThomas Wolf2022-04-141-8/+8
* | | | | | | | GpgSigner: prevent class lock inversion on the default signerThomas Wolf2022-04-141-14/+30
* | | | | | | | Fetch: Introduce negative refspecs.yunjieli2022-04-135-8/+116
* | | | | | | | BaseSearch: Suppress ReferenceEquality WarningsFabio Ponciroli2022-04-021-0/+1
* | | | | | | | RewriteGenerator: Suppress ReferenceEquality WarningsFabio Ponciroli2022-04-011-0/+1
* | | | | | | | PlotCommit: Suppress ReferenceEquality WarningsFabio Ponciroli2022-04-011-0/+1
* | | | | | | | PlotCommitList: Suppress ReferenceEquality WarningsFabio Ponciroli2022-04-011-0/+4
* | | | | | | | Use git config core.commentCharThomas Wolf2022-03-265-34/+94
* | | | | | | | CommitConfig: add support for core.commentCharThomas Wolf2022-03-262-2/+111
* | | | | | | | [push, lfs] Tell the pre-push hook whether the push is a dry runThomas Wolf2022-03-232-2/+26
* | | | | | | | Merge changes I5df54a92,Iecc61d1cMatthias Sohn2022-03-223-52/+138
|\ \ \ \ \ \ \ \
| * | | | | | | | LsRemoteCommand: apply url.*.insteadOfThomas Wolf2022-03-151-6/+14
| * | | | | | | | Factor out URL replacement from RemoteConfigThomas Wolf2022-03-152-46/+124
* | | | | | | | | DirCacheCheckout: use a LinkedHashMap instead of HashMapThomas Wolf2022-03-191-2/+2
* | | | | | | | | Re-try reading a file when there are concurrent writesThomas Wolf2022-03-193-107/+168
* | | | | | | | | [sideband] Ensure last bit of progress channel is writtenThomas Wolf2022-03-193-7/+39
|/ / / / / / / /