summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Enable rebase to continue for all rebase stagesRobin Rosenberg2012-08-271-0/+3
* Merge "Refactor detection of Windows platform to SystemReader"Matthias Sohn2012-08-265-19/+16
|\
| * Refactor detection of Windows platform to SystemReaderRobin Rosenberg2012-08-225-19/+16
* | Merge "Set core.precomposeunicode to true when creating repository on Mac"Matthias Sohn2012-08-263-5/+21
|\|
| * Set core.precomposeunicode to true when creating repository on MacRobin Rosenberg2012-08-223-5/+21
* | Merge "Refactor detection of OS X to SystemReader"Matthias Sohn2012-08-263-18/+18
|\|
| * Refactor detection of OS X to SystemReaderRobin Rosenberg2012-08-223-18/+18
* | Merge changes I98df46ce,Ifb815a12,I051a1724Robin Rosenberg2012-08-213-37/+238
|\ \
| * | Support [<ref>]@{upstream} revision syntaxRobin Rosenberg2012-07-202-1/+65
| * | Support parsing previous checkout as a revision expresion.Robin Rosenberg2012-07-203-45/+138
| * | Allow a @ without branch in revision syntaxRobin Rosenberg2012-07-162-3/+47
* | | 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
| | |/ | |/|
* | | Merge changes I4f73487b,I1d1ed122Matthias Sohn2012-08-212-1/+3
|\ \ \
| * | | The Git API's only likes /, not \ in pathsRobin Rosenberg2012-08-211-1/+1
| * | | Skip a test that cannot be verified on WindowsRobin Rosenberg2012-08-211-0/+2
| |/ /
* | | Teach BranchTrackingStatus to handle tracking of local branchesMatthias Sohn2012-08-183-6/+79
* | | Improve ours/theirs conflict markers for rebase, cherry-pickRobin Stocker2012-08-186-12/+123
|/ /
* | 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-152-4/+35
|/ /
* | Merge "Allow JGit to read C Git rebase state"Christian Halstrick2012-08-132-3/+10
|\ \
| * | Allow JGit to read C Git rebase stateRobin Rosenberg2012-08-072-3/+10
* | | Make CheckoutCommand pass modified files through resultMarkus Duft2012-08-072-12/+61
* | | Allow detection of case insensitive file systemsMatthias Sohn2012-08-065-0/+41
* | | Ensure a directory exists before trying to create/merge a file into it.Jevgeni Zelenkov2012-08-064-0/+47
* | | Merge "Fix PlotCommit for commits with duplicate parents"Robin Rosenberg2012-08-052-3/+41
|\ \ \ | |/ / |/| |
| * | Fix PlotCommit for commits with duplicate parentsRobin Rosenberg2012-08-052-3/+41
* | | Merge "Update the README file to refer to the EDL rather than BSD license."Shawn Pearce2012-08-011-2/+3
|\ \ \
| * | | Update the README file to refer to the EDL rather than BSD license.Robin Rosenberg2012-08-011-2/+3
* | | | Merge "Fix resolving of relative file URIs in TransportLocal"Robin Rosenberg2012-07-292-2/+15
|\ \ \ \
| * | | | Fix resolving of relative file URIs in TransportLocalRobin Stocker2012-07-272-2/+15
* | | | | Merge "Garbage collector for FileRepositories"Robin Rosenberg2012-07-299-2/+1368
|\ \ \ \ \
| * | | | | Garbage collector for FileRepositoriesChristian Halstrick2012-07-299-2/+1368
| | |/ / / | |/| | |
* | | | | Merge "Expose some DFS APIs as public or protected"Shawn O. Pearce2012-07-293-3/+22
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Expose some DFS APIs as public or protectedShawn O. Pearce2012-07-273-3/+22
* | | | | Merge "[findBugs] Make ChunkKey serializable"Robin Rosenberg2012-07-261-1/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [findBugs] Make ChunkKey serializableRobin Stocker2012-07-151-1/+4
* | | | | Again teach ResolveMerger to create more correct DirCacheEntry'sChristian Halstrick2012-07-263-35/+549
* | | | | Merge "Revert "Teach ResolveMerger to create more correct DirCacheEntry's""Shawn Pearce2012-07-253-280/+27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Revert "Teach ResolveMerger to create more correct DirCacheEntry's"Shawn Pearce2012-07-243-280/+27
* | | | | Merge "Teach ResolveMerger to create more correct DirCacheEntry's"Robin Rosenberg2012-07-193-27/+280
|\| | | |
| * | | | Teach ResolveMerger to create more correct DirCacheEntry'sMarkus Duft2012-07-193-27/+280
* | | | | show: Implement command line show for any objectShawn O. Pearce2012-07-184-1/+322
|/ / / /
* | | | Fix "description" in o.e.jgit.source.feature/feature.propertiesTomasz Zarna2012-07-171-2/+2
* | | | Make ApplyCommand create missing parent directories for new filesMarkus Duft2012-07-163-0/+19
* | | | Merge "Rename local variables in Repository.resolve"Christian Halstrick2012-07-161-61/+63
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Rename local variables in Repository.resolveRobin Rosenberg2012-07-131-61/+63
* | | Typo in CLIText#unknownMergeStratey, should be #unknownMergeStrategyTomasz Zarna2012-07-143-3/+3
|/ /