summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge "Don't delete .idx file if .pack file can't be deleted"Robin Rosenberg2013-11-172-18/+75
|\
| * Don't delete .idx file if .pack file can't be deletedChristian Halstrick2013-11-132-18/+75
* | Document that path parameters should use '/' as separatorRobin Stocker2013-11-1514-22/+36
* | Improve Javadoc for typeHint parameterRobin Stocker2013-11-143-15/+17
* | Do not update the ref hot bit when checking isIndexLoadedColby Ranger2013-11-132-1/+5
* | Update to Ant 1.9.2Matthias Sohn2013-11-121-1/+1
* | Merge "Add missing @since tags"Matthias Sohn2013-11-127-0/+14
|\ \
| * | Add missing @since tagsMatthias Sohn2013-11-097-0/+14
* | | Add uses directives to ensure OSGi wires jgit bundles correctlyMatthias Sohn2013-11-125-37/+129
* | | Introduce Kepler and Luna target platformMatthias Sohn2013-11-124-2/+125
* | | Update build to use Tycho 0.19Matthias Sohn2013-11-111-2/+2
| |/ |/|
* | [findBugs] Remove nonsense callMatthias Sohn2013-11-101-1/+0
* | Remove unnecessary @SuppressWarnings("null")Matthias Sohn2013-11-101-5/+0
* | Grant access to internal jgit package to org.eclipse.jgit.junitMatthias Sohn2013-11-101-1/+2
* | Remove duplicate package exportMatthias Sohn2013-11-101-3/+0
* | Don't import non-existing package org.eclipse.jgit.java7Matthias Sohn2013-11-102-2/+0
|/
* Interactive Rebase: Do actions if there were conflictsStefan Lay2013-11-082-80/+324
* Rebase interactive should finish if last step is editStefan Lay2013-11-062-9/+47
* Merge changes I40f2311c,I3c419094Matthias Sohn2013-11-057-12/+620
|\
| * Add additional RebaseResult for editing commitsStefan Lay2013-11-053-9/+20
| * Add Squash/Fixup support for rebase interactive in RebaseCommandTobias Pfeifer2013-11-056-3/+600
* | Merge changes I85470d1d,I43711486,Ie6ade781,Ic9ab2b6e,Iebe50933,Id6fac253,Ia6...Shawn Pearce2013-11-0530-136/+412
|\ \ | |/ |/|
| * Use absolute paths for file:// URIs in testsShawn Pearce2013-11-019-31/+44
| * Use getPath() in FileResolverTestShawn Pearce2013-11-011-1/+1
| * Extract protocol constants to a common classShawn Pearce2013-11-017-50/+202