summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
Commit message (Expand)AuthorAgeFilesLines
* Merge "Refactored method to find branches from which a commit is reachable"Robin Rosenberg2012-08-211-0/+73
|\
| * Refactored method to find branches from which a commit is reachableRobin Rosenberg2012-08-211-0/+73
* | Teach BranchTrackingStatus to handle tracking of local branchesMatthias Sohn2012-08-182-6/+39
* | Improve ours/theirs conflict markers for rebase, cherry-pickRobin Stocker2012-08-183-7/+79
|/
* Merge changes Ie949f321,I403de522Shawn Pearce2012-08-157-5/+69
|\
| * Implement wasDeltaAttempted() in DfsObjectRepresentation.Colby Ranger2012-08-133-1/+34
| * Do not delta compress objects that have already tried to compress.Colby Ranger2012-08-134-4/+35
* | Fix idOffset when the working tree iterator matches a dircache entryRobin Rosenberg2012-08-151-4/+10
|/
* Merge "Allow JGit to read C Git rebase state"Christian Halstrick2012-08-131-1/+8
|\
| * Allow JGit to read C Git rebase stateRobin Rosenberg2012-08-071-1/+8
* | Make CheckoutCommand pass modified files through resultMarkus Duft2012-08-072-12/+61
* | Allow detection of case insensitive file systemsMatthias Sohn2012-08-063-0/+21
* | Ensure a directory exists before trying to create/merge a file into it.Jevgeni Zelenkov2012-08-061-0/+1
* | Merge "Fix PlotCommit for commits with duplicate parents"Robin Rosenberg2012-08-051-3/+7
|\ \ | |/ |/|
| * Fix PlotCommit for commits with duplicate parentsRobin Rosenberg2012-08-051-3/+7
* | Merge "Fix resolving of relative file URIs in TransportLocal"Robin Rosenberg2012-07-291-2/+2
|\ \
| * | Fix resolving of relative file URIs in TransportLocalRobin Stocker2012-07-271-2/+2
* | | Merge "Garbage collector for FileRepositories"Robin Rosenberg2012-07-295-0/+908
|\ \ \
| * | | Garbage collector for FileRepositoriesChristian Halstrick2012-07-295-0/+908
* | | | Expose some DFS APIs as public or protectedShawn O. Pearce2012-07-273-3/+22
| |/ / |/| |
* | | Again teach ResolveMerger to create more correct DirCacheEntry'sChristian Halstrick2012-07-261-35/+81
* | | Revert "Teach ResolveMerger to create more correct DirCacheEntry's"Shawn Pearce2012-07-241-74/+26
|/ /
* | Teach ResolveMerger to create more correct DirCacheEntry'sMarkus Duft2012-07-191-26/+74
* | Make ApplyCommand create missing parent directories for new filesMarkus Duft2012-07-161-0/+2
* | Rename local variables in Repository.resolveRobin Rosenberg2012-07-131-61/+63
* | Get rid of warning about possible NullPointerExceptionRobin Rosenberg2012-07-131-5/+5
* | Merge "Work around smart HTTP bugs in C Git"Shawn O. Pearce2012-07-112-3/+32
|\ \
| * | Work around smart HTTP bugs in C GitShawn O. Pearce2012-06-272-3/+32
* | | Create parent dir if necessary on checkoutRobin Stocker2012-07-081-2/+5
| |/ |/|
* | Merge branch 'stable-2.0'Matthias Sohn2012-07-021-0/+11
|\ \ | |/ |/|
| * Improve performance of persisting an index by magnitudesstable-2.0Christian Halstrick2012-06-281-0/+11
* | Make InMemoryRepository pack names globally uniqueDave Borowitz2012-06-271-1/+2
* | Merge "Disable PackParser EOF check if more data expected"Shawn Pearce2012-06-271-1/+2
|\ \
| * | Disable PackParser EOF check if more data expectedIan Wetherbee2012-06-261-1/+2
* | | Use the working tree's .gitmodules in SubmoduleWalk.forIndex()Dave Borowitz2012-06-251-19/+9
* | | Merge changes I6b2ce96b,I499f518fChristian Halstrick2012-06-251-10/+17
|\ \ \
| * | | Fix order of deletion for files/dirs in ResolveMergerRobin Stocker2012-06-231-9/+16
| * | | Don't return success on failing paths in ResolveMergerRobin Stocker2012-06-231-1/+1
* | | | Add toString() to simplify debugging rebase stepsMatthias Sohn2012-06-241-0/+14
* | | | Ignore empty lines when parsing git-rebase-todoRobin Stocker2012-06-231-3/+2
|/ / /
* / / Make clear method on StoredConfig publicRobin Rosenberg2012-06-211-0/+5
|/ /
* | Merge "Refactor TransportHttp for long-polling"Shawn Pearce2012-06-161-92/+139
|\ \
| * | Refactor TransportHttp for long-pollingIan Wetherbee2012-06-151-92/+139
* | | Merge "ReceivePack supports InputStream data after pack"Shawn Pearce2012-06-164-9/+55
|\ \ \
| * | | ReceivePack supports InputStream data after packIan Wetherbee2012-06-154-9/+55
| |/ /
* / / Fix resource leaks due to unclosed repositoriesChristian Halstrick2012-06-165-42/+74
|/ /
* | Read .gitmodules config from the tree in SubmoduleWalkDave Borowitz2012-06-153-7/+144
* | Add a release() method to SubmoduleWalkDave Borowitz2012-06-151-12/+29
* | Add "--squash" option to MergeCommandTomasz Zarna2012-06-1511-54/+335
* | Remove unused import of ObjectInserter in ResolveMergerTomasz Zarna2012-06-151-2/+1