summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Tag som non-localizable strings with NON-NLSRobin Rosenberg2014-01-1010-22/+19
* Add missing package import for org.eclipse.jgit.archiveMatthias Sohn2014-01-071-0/+1
* Remove unused import from ArchiveTestMatthias Sohn2014-01-071-1/+0
* Suppport the GIT_CONFIG_NOSYSTEM environment variableRobin Rosenberg2014-01-063-2/+25
* Merge "archive: Use an empty directory for submodules"Dave Borowitz2013-12-272-3/+50
|\
| * archive: Use an empty directory for submodulesJonathan Nieder2013-12-272-3/+50
* | Merge "archive: Include entries for directories"Dave Borowitz2013-12-276-26/+143
|\|
| * archive: Include entries for directoriesJonathan Nieder2013-12-276-26/+143
* | [CLI] Add option --millis / -m to debug-show-dir-cache commandMatthias Sohn2013-12-272-3/+13
* | Merge branch 'stable-3.2'Matthias Sohn2013-12-190-0/+0
|\ \ | |/ |/|
| * Prepare post 3.2.0 buildsstable-3.2Matthias Sohn2013-12-1851-51/+51
| * JGit v3.2.0.201312181205-rv3.2.0.201312181205-rMatthias Sohn2013-12-1851-51/+51
| * Revert "Fix for core.autocrlf=input resulting in modified file..."Matthias Sohn2013-12-187-200/+20
| * Fix for core.autocrlf=input resulting in modified file and unsmudgeRobin Rosenberg2013-12-187-20/+200
* | archive: Prepend a specified prefix to all entry filenamesJonathan Nieder2013-12-175-1/+115
* | Merge branch 'stable-3.2'Matthias Sohn2013-12-138-59/+361
|\|
| * Canonicalize worktree path in BaseRepositoryBuilder if set via configRobin Stocker2013-12-121-1/+1
| * Add missing @since tags for new public methods in ConfigMatthias Sohn2013-12-111-0/+2
| * Don't use API exception in RebaseTodoLineChristian Halstrick2013-12-113-43/+182
| * Merge "Fix aborting rebase with detached head" into stable-3.2Robin Rosenberg2013-12-102-13/+81
| |\
| | * Fix aborting rebase with detached headStefan Lay2013-12-102-13/+81
| * | Add recursive variant of Config.getNames() methodsMatthias Sohn2013-12-063-2/+95
| |/
| * Merge branch 'master' into stable-3.2Matthias Sohn2013-12-0589-1040/+2740
| |\
| * | Prepare post 3.2.0-m3 buildsMatthias Sohn2013-11-1351-56/+56
| * | JGit v3.2.0.201311130903-m3v3.2.0.201311130903-m3Matthias Sohn2013-11-1351-56/+56
* | | Prepare 3.3.0-SNAPSHOT buildsMatthias Sohn2013-12-0551-242/+242
| |/ |/|
* | Implement rebase.autostashStefan Lay2013-12-046-23/+276
* | Merge "CLI status should support --porcelain"Matthias Sohn2013-12-043-8/+236
|\ \
| * | CLI status should support --porcelainKaloyan Raev2013-12-043-8/+236
* | | Merge "More helpful InvalidPathException messages (include reason)"Christian Halstrick2013-12-045-24/+52
|\ \ \ | |/ / |/| |
| * | More helpful InvalidPathException messages (include reason)Robin Stocker2013-12-035-24/+52
* | | Fix IgnoreRule#isMatch returning wrong result due to missing resetRobin Stocker2013-12-032-0/+13
|/ /
* | Fix exception on conflicts with recursive mergeRobin Stocker2013-12-036-27/+72
* | Add pgm test for checkout of existing branch with checkout conflictAxel Richard2013-12-021-0/+26
* | Fix broken symbolic links on Cygwin.John Ross2013-12-021-4/+4
* | Do not allow non-ff-rebase if there are uncommitted changesStefan Lay2013-12-024-35/+240
* | Manage CheckoutConflictException in pgmAxel Richard2013-11-293-0/+12
* | Fix handling of file/folder conflicts during a checkoutChristian Halstrick2013-11-292-1/+32
* | Mention null return in Javadoc of Config#getStringRobin Stocker2013-11-291-2/+2
* | Fix applying stash on other commitStefan Lay2013-11-292-0/+88
* | Use static factory methods instead of overloaded constructorsStefan Lay2013-11-292-18/+27
* | Break up GCTest to run in parallelShawn Pearce2013-11-2411-777/+1226
* | Modify T0004_PackReaderTest to use existing packShawn Pearce2013-11-241-10/+10
* | Move SampleDataRepositoryTestCase to org.eclipse.jgit.testShawn Pearce2013-11-2416-16/+19
* | Support running from JARs in JGitTestUtilShawn Pearce2013-11-242-5/+38
* | Cache SimpleDateFormat in GitDateParser per localeMatthias Sohn2013-11-236-34/+133
* | Fix FIXUP error for blank lines in interactive rebaseStefan Lay2013-11-222-1/+39
* | Fix parsing Rebase todo lines when commit message is missingStefan Lay2013-11-212-0/+15
* | Add close() method to APIChristian Halstrick2013-11-202-0/+48
* | Update Jetty to 7.6.14.v20131031Matthias Sohn2013-11-183-35/+35