summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
Commit message (Expand)AuthorAgeFilesLines
* Merge "Improve handling of checkout conflicts"Robin Rosenberg2013-01-203-2/+80
|\
| * Improve handling of checkout conflictsMarkus Duft2013-01-113-2/+80
* | Merge changes I7e7fae12,I87ecca00Robin Rosenberg2013-01-192-32/+88
|\ \
| * | Add conflicts message before footerStefan Lay2013-01-191-6/+19
| * | Only replace the ChangeId in the footer, not in the bodyStefan Lay2013-01-191-26/+69
* | | Merge "Use correct method link in Javadoc"Robin Rosenberg2013-01-192-4/+6
|\ \ \
| * | | Use correct method link in JavadocDani Megert2013-01-182-4/+6
* | | | Merge "Fix patch application WRT windows line endings."Robin Rosenberg2013-01-191-7/+4
|\ \ \ \
| * | | | Fix patch application WRT windows line endings.Markus Duft2013-01-191-7/+4
| | |/ / | |/| |
* | | | Merge "Update DfsGarbageCollector to not read back a pack index."Colby Ranger2013-01-185-28/+75
|\ \ \ \
| * | | | Update DfsGarbageCollector to not read back a pack index.Colby Ranger2013-01-185-28/+75
* | | | | Merge "Define a tree filter for user-visible changes between two indexes"Robin Rosenberg2013-01-181-0/+105
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Define a tree filter for user-visible changes between two indexesRobin Rosenberg2013-01-151-0/+105
| |/ / /
* | | | Merge "Add additional FastForwardMode enums for different config contexts"Shawn Pearce2013-01-183-4/+113
|\ \ \ \ | |_|/ / |/| | |
| * | | Add additional FastForwardMode enums for different config contextsTomasz Zarna2013-01-183-4/+113
| |/ /
* / / Rename PackConstants to PackExt, a typed pack file extension.Colby Ranger2013-01-1711-55/+88
|/ /
* | Remove getReverseIndexSize() from DfsPackDescription.Colby Ranger2013-01-152-10/+5
* | Use file extension with DfsPackDescription get/set file size.Colby Ranger2013-01-156-40/+31
* | Fix concurrent creation of fan-out object directoriesRoberto Tyley2013-01-131-1/+1
|/
* Accept '-' instead of space in enum config valuesShawn Pearce2013-01-111-0/+6
* Revert "Add additional FastForwardMode enums for different config contexts"Shawn Pearce2013-01-113-121/+2
* Fix enum parsing from Config filesShawn Pearce2013-01-111-1/+1
* Merge changes Ifc8fc3e5,I7c403b50Colby Ranger2013-01-1018-135/+153
|\
| * Remove packIndex field from FileObjDatabase openPack method.Colby Ranger2013-01-107-30/+21
| * Update DfsObjDatabase API to open/write by pack extension.Colby Ranger2013-01-1011-105/+132
* | Peel tags during resolve of foo^Dave Borowitz2013-01-101-1/+1
|/
* Merge "Revert "Speed up PathFilterGroup.include for large set of paths""Robin Rosenberg2013-01-091-55/+15
|\
| * Revert "Speed up PathFilterGroup.include for large set of paths"Robin Rosenberg2013-01-091-55/+15
* | Merge "Consider that some Java version on Linux only return integral timestamps"Robin Rosenberg2013-01-081-1/+4
|\ \
| * | Consider that some Java version on Linux only return integral timestampsRobin Rosenberg2013-01-051-1/+4
* | | Merge changes I3e9735c7,I76a16594Robin Rosenberg2013-01-082-27/+66
|\ \ \ | | |/ | |/|
| * | Speed up PathFilterGroup.include for large set of pathsRobin Rosenberg2013-01-071-15/+55
| * | Speed up handling of "only" paths in the CommitCommandRobin Rosenberg2013-01-071-12/+11
| |/
* | Return info about config subsection when trying to get an invalid enumTomasz Zarna2013-01-081-4/+6
* | Add additional FastForwardMode enums for different config contextsTomasz Zarna2013-01-063-2/+121
|/
* Ignore removed files with an assume-valid index entryRobin Rosenberg2013-01-031-4/+12
* Merge "Revert "Stop PathFilter after walking all matching paths""Robin Rosenberg2013-01-011-5/+1
|\
| * Revert "Stop PathFilter after walking all matching paths"Shawn Pearce2013-01-011-5/+1
* | Update the revert command and things relating to revertRobin Rosenberg2012-12-287-8/+159
|/
* Stop PathFilter after walking all matching pathsDave Borowitz2012-12-271-1/+5
* Do not enforce DeltaWindow maxMemory when zero.Colby Ranger2012-12-271-0/+3
* Merge "Enforce max memory for DeltaWindow."Colby Ranger2012-12-271-0/+24
|\
| * Enforce max memory for DeltaWindow.Colby Ranger2012-12-271-0/+24
* | Make jgit diff obey core.autocrlfRobin Rosenberg2012-12-271-57/+1
* | Do not perform character translation on copies in patchesRobin Rosenberg2012-12-271-3/+8
* | Mark non-externalizable strings as suchRobin Rosenberg2012-12-27223-1163/+1238
|/
* Prepare 2.3.0 buildsMatthias Sohn2012-12-213-32/+32
* Prepare post 2.2.0.201212191850-r buildsstable-2.2Matthias Sohn2012-12-213-3/+3
* JGit v2.2.0.201212191850-rv2.2.0.201212191850-rMatthias Sohn2012-12-203-3/+3
* DirCacheIterator: Fix reset() and back()Robin Rosenberg2012-12-152-1/+22