summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm
Commit message (Expand)AuthorAgeFilesLines
* Prepare 6.3.0-SNAPSHOT buildsMatthias Sohn2022-06-073-46/+46
* Adapt diff- and merge tool code for PGM and EGit usageAndre Bossert2022-06-022-155/+155
* Add availability check of pre-defined toolsAndre Bossert2022-06-014-37/+94
* Add filtering with help of DirCacheCheckout.getContent()Andre Bossert2022-05-302-46/+133
* Add mergetool merge feature (execute external tool)Andre Bossert2022-05-254-69/+305
* Add command line support for "git mergetool"Andre Bossert2022-05-254-2/+218
* Add difftool compare feature (execute external tool)Andre Bossert2022-05-252-31/+71
* Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn2022-03-033-46/+46
* [pgm] Add describe --abbrev optionMatthias Sohn2022-03-022-0/+7
* Introduce a constant for the length of an abbreviated hash stringSebastian Schuberth2022-02-033-4/+13
* [errorprone] Fix implicit use of platform default charsetMatthias Sohn2022-01-191-1/+3
* Merge branch 'stable-6.0'Thomas Wolf2022-01-054-13/+8
|\
| * Merge branch 'stable-5.13' into stable-6.0Thomas Wolf2022-01-054-13/+8
| |\
| | * Use slf4j-simple instead of log4j for loggingMatthias Sohn2021-12-314-13/+8
| | * Prepare 5.13.1-SNAPSHOT buildsMatthias Sohn2021-09-083-43/+43
| | * JGit v5.13.0.202109080827-rv5.13.0.202109080827-rMatthias Sohn2021-09-083-4/+4
| | * Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-09-013-4/+4
| | * JGit v5.13.0.202109011149-rc1v5.13.0.202109011149-rc1Matthias Sohn2021-09-013-4/+4
| * | Prepare 6.0.1-SNAPSHOT buildsMatthias Sohn2021-11-293-44/+44
| * | JGit v6.0.0.202111291000-rv6.0.0.202111291000-rMatthias Sohn2021-11-293-4/+4
| * | Prepare 6.0.0-SNAPSHOT buildsMatthias Sohn2021-11-243-4/+4
| * | JGit v6.0.0.202111241155-rc1v6.0.0.202111241155-rc1Matthias Sohn2021-11-243-4/+4
* | | Add config reader for user-defined difftoolsAndre Bossert2021-12-081-7/+7
* | | Add command line support for "git difftool"Andre Bossert2021-11-255-0/+274
* | | Prepare 6.1.0-SNAPSHOT buildsMatthias Sohn2021-11-243-44/+44
|/ /
* | Update Jetty to 10.0.6Matthias Sohn2021-11-221-6/+6
* | sshd: add support for ssh-agentThomas Wolf2021-11-031-0/+6
* | Binary and CR-LF detection: lone CRs -> binaryThomas Wolf2021-10-312-3/+3
* | Fix split package in bundle org.eclipse.jgit.ssh.jschMatthias Sohn2021-09-292-1/+2
* | Enable compiler option --releaseMatthias Sohn2021-09-292-3/+122
* | Bump minimum required Java version to 11Matthias Sohn2021-09-293-5/+9
* | Merge branch 'master' into nextMatthias Sohn2021-09-133-4/+8
|\|
| * Ignore IllegalStateException if JVM is already shutting downMatthias Sohn2021-08-291-2/+6
| * [pgm] Fix default meta variable defined in StopOptionHandlerMatthias Sohn2021-06-281-1/+1
| * Fix typo in javadoc of PathTreeFilterHandlerMatthias Sohn2021-06-281-1/+1
* | Merge branch 'master' into nextMatthias Sohn2021-06-151-0/+3
|\|
| * Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-06-143-43/+43
| * Prepare 5.12.1-SNAPSHOT buildsMatthias Sohn2021-06-133-43/+43
| * JGit v5.12.0.202106070339-rv5.12.0.202106070339-rMatthias Sohn2021-06-073-4/+4
| * Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-033-4/+4
| * JGit v5.12.0.202106021050-rc1v5.12.0.202106021050-rc1Matthias Sohn2021-06-023-4/+4
| * Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-023-4/+4
| * JGit v5.12.0.202106011439-rc1v5.12.0.202106011439-rc1Matthias Sohn2021-06-013-4/+4
| * Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-013-4/+4
| * JGit v5.12.0.202105261145-m3v5.12.0.202105261145-m3Matthias Sohn2021-05-263-4/+4
| * pgm: rewrite parents when --parents flag is passedkylezhao2021-05-261-0/+3
* | Merge branch 'master' into nextMatthias Sohn2021-05-123-2/+24
|\|
| * Implement ours/theirs content conflict resolutionThomas Wolf2021-04-193-2/+24
| * Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-03-103-43/+43
| * Prepare 5.11.1-SNAPSHOT buildsMatthias Sohn2021-03-093-43/+43
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 11:22:45 +0000