summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add mergetool merge feature (execute external tool)Andre Bossert2022-05-2511-185/+847
* Add command line support for "git mergetool"Andre Bossert2022-05-2516-171/+1269
* Add config reader for user-defined mergetoolsAndre Bossert2022-05-256-4/+483
* Add difftool compare feature (execute external tool)Andre Bossert2022-05-2512-97/+894
* Update Orbit to S20220517184036Matthias Sohn2022-05-259-71/+71
* 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-153-9/+39
* Merge branch 'stable-6.2'Matthias Sohn2022-05-094-23/+56
|\
| * Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2022-05-094-23/+56
| |\
| | * HTTP Smart: set correct HTTP status on errorSven Selberg2022-05-094-23/+56
* | | Merge branch 'stable-6.2'Matthias Sohn2022-05-050-0/+0
|\| |
| * | Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-05-0591-125/+125
| * | JGit v6.2.0.202205041315-m2v6.2.0.202205041315-m2Matthias Sohn2022-05-0491-125/+125
|/ /
* | Update list of 3rd party dependenciesMatthias Sohn2022-05-031-24/+26
* | Add target platforms for eclipse 4.23 (2022-03) and 4.24 (2022-06)Matthias Sohn2022-05-034-0/+210
* | Update Orbit to I20220502200629Matthias Sohn2022-05-0215-33/+102
* | [sshd] Better user feedback on authentication failureThomas Wolf2022-05-0112-61/+586
* | Lazy loading of .lfsconfig.Matthias Fromme2022-04-301-21/+41
* | [releng] bump japicmp base versionThomas Wolf2022-04-251-1/+1
* | 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-137-8/+211
* | Merge "Add GetRefsBenchmark for testing refs lookups"Han-Wen NIenhuys2022-04-051-0/+181
|\ \
| * | Add GetRefsBenchmark for testing refs lookupsLuca Milanesio2022-04-011-0/+181
* | | 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
|/ /
* | [pgm tests] Relax version constraints for hamcrestMatthias Sohn2022-03-301-1/+1
* | Use git config core.commentCharThomas Wolf2022-03-267-34/+258
* | CommitConfig: add support for core.commentCharThomas Wolf2022-03-263-2/+190
* | [push, lfs] Tell the pre-push hook whether the push is a dry runThomas Wolf2022-03-233-5/+31
* | Merge changes I5df54a92,Iecc61d1cMatthias Sohn2022-03-224-52/+154
|\ \
| * | LsRemoteCommand: apply url.*.insteadOfThomas Wolf2022-03-152-6/+30
| * | Factor out URL replacement from RemoteConfigThomas Wolf2022-03-152-46/+124
* | | LFS: clean up messagesThomas Wolf2022-03-212-4/+2
* | | DirCacheCheckout: use a LinkedHashMap instead of HashMapThomas Wolf2022-03-192-10/+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-194-7/+56
* | | Add tests for SideBandInputStreamThomas Wolf2022-03-191-0/+212
* | | WinPipeConnector: Resolve warnings by using "equals" instead of "=="Fabio Ponciroli2022-03-171-1/+1
|/ /
* | Fix MANIFEST.MF in the LFS bundlesThomas Wolf2022-03-122-0/+2
* | Update Tycho to 2.6.0Matthias Sohn2022-03-092-2/+2
* | Merge branch 'stable-6.1'Matthias Sohn2022-03-0929-358/+1808
|\|
| * Prepare 6.1.1-SNAPSHOT buildsMatthias Sohn2022-03-0891-527/+527
| * JGit v6.1.0.202203080745-rv6.1.0.202203080745-rMatthias Sohn2022-03-0891-125/+125
| * [checkout] Use .gitattributes from the commit to be checked outThomas Wolf2022-03-077-145/+489
| * Don't use final for method parametersMatthias Sohn2022-03-063-20/+14