|author||Thomas Wolf <email@example.com>||Thu Apr 29 12:58:23 2021 +0200|
|committer||Thomas Wolf <firstname.lastname@example.org>||Mon May 03 10:59:24 2021 +0200|
Add git config for conflict style merge/diff3 Add a constant in ConfigConstants, and a ConflictStyle enum in MergeCommand. Change-Id: Idf8e036b6b6953bec06d6923a39e5ff30c2da562 Signed-off-by: Thomas Wolf <email@example.com>
An implementation of the Git version control system in pure Java.
This project is licensed under the EDL (Eclipse Distribution License).
A pure Java library capable of being run standalone, with no additional support libraries. It provides classes to read and write a Git repository and operate on a working directory.
All portions of JGit are covered by the EDL. Absolutely no GPL, LGPL or EPL contributions are accepted within this package.
Ant tasks based on JGit.
Support for exporting to various archive formats (zip etc).
Apache httpclient support.
Server for the smart and dumb Git HTTP protocol.
Support for LFS (Large File Storage).
Basic LFS server support.
Production of Eclipse features and p2 repository for JGit. See the JGit Wiki on why and how to use this module.
Command-line interface Git commands implemented using JGit ("pgm" stands for program).
Client support for the ssh protocol based on Apache Mina sshd.
Simple UI for displaying git log.
Native symbolic links are supported, provided the file system supports them. For Windows you must use a non-administrator account and have the SeCreateSymbolicLinkPrivilege.
Only the timestamp of the index is used by JGit if the index is dirty.
JGit requires at least a Java 8 JDK.
CRLF conversion is performed depending on the
core.autocrlf setting, however Git for Windows by default stores that setting during installation in the "system wide" configuration file. If Git is not installed, use the global or repository configuration for the core.autocrlf setting.
The system wide configuration file is located relative to where C Git is installed. Make sure Git can be found via the PATH environment variable. When installing Git for Windows check the "Run Git from the Windows Command Prompt" option. There are other options like Eclipse settings that can be used for pointing out where C Git is installed. Modifying PATH is the recommended option if C Git is installed.
We try to use the same notation of
$HOME as C Git does. On Windows this is often not the same value as the
user.home system property.
Read loose and packed commits, trees, blobs, including deltafied objects.
Read objects from shared repositories
Write loose commits, trees, blobs.
Write blobs from local files or Java InputStreams.
Read blobs as Java InputStreams.
Copy trees to local directory, or local directory to a tree.
Lazily loads objects as necessary.
Read and write .git/config files.
Create a new repository.
Read and write refs, including walking through symrefs.
Read, update and write the Git index.
Checkout in dirty working directory if trivial.
Walk the history from a given set of commits looking for commits introducing changes in files under a specified path.
Fetch via ssh, git, http, Amazon S3 and bundles. Push via ssh, git and Amazon S3. JGit does not yet deltify the pushed packs so they may be a lot larger than C Git packs.
And much more
There are some missing features:
See the EGit Contributor Guide.
More information about Git, its repository format, and the canonical C based implementation can be obtained from the Git website.