summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unused importsMatthias Sohn2013-02-141-4/+0
* Merge branch 'stable-2.3'Matthias Sohn2013-02-136-10/+148
|\
| * Prepare post 2.3.0.201302130906 buildsMatthias Sohn2013-02-1339-39/+39
| * JGit v2.3.0.201302130906v2.3.0.201302130906Matthias Sohn2013-02-1339-39/+39
| * Replace explicit version by property where possibleMatthias Sohn2013-02-134-8/+8
| * Add better documentation to DirCacheCheckoutChristian Halstrick2013-02-071-1/+139
| * Prepare post 2.3rc1 buildsMatthias Sohn2013-02-0639-49/+49
| * JGit v2.3.0.201302060400-rc1v2.3.0.201302060400-rc1Matthias Sohn2013-02-0639-50/+50
* | Merge "Remove unused availableRefs local from Clone.guessHEAD"Robin Rosenberg2013-02-131-3/+0
|\ \
| * | Remove unused availableRefs local from Clone.guessHEADJonathan Nieder2013-02-121-3/+0
* | | Implement core.checkstat = minimalRobin Rosenberg2013-02-104-5/+52
|/ /
* | Fix Config.fromText to not skip a last line with no newlineDave Borowitz2013-02-082-1/+13
* | Really handle annotated tags in MergeCommandRobin Rosenberg2013-02-081-0/+1
|/
* Add getConflictingNames to RefDatabaseRobin Stocker2013-02-062-1/+188
* Move base test classes to the junit bundle for reuse for Java 7 testsRobin Rosenberg2013-02-04115-109/+136
* Merge "Extract method to output the first header line of a git diff"Robin Rosenberg2013-02-021-6/+27
|\
| * Extract method to output the first header line of a git diffTobias Pfeifer2013-01-301-6/+27
* | Fixed problems occuring when changing user in gerrit configurationTobias Pfeifer2013-02-011-1/+1
* | Update to latest orbit releaseMatthias Sohn2013-01-313-31/+7
* | Remove PathFilterGroupTest2Robin Rosenberg2013-01-301-254/+0
* | Remove debug printouts from PathFilterGroupTestRobin Rosenberg2013-01-301-2/+0
* | Fix stash apply using merge logicRobin Rosenberg2013-01-305-235/+199
* | Merge "Align execution environment with JRE on the classpath in jgit.ant.test"Matthias Sohn2013-01-291-1/+1
|\ \ | |/ |/|
| * Align execution environment with JRE on the classpath in jgit.ant.testTomasz Zarna2013-01-281-1/+1
* | Fix Check for FF_ONLY merges againRobin Rosenberg2013-01-292-23/+36
* | Merge "Check for FF_ONLY merges correctly"Robin Rosenberg2013-01-282-2/+41
|\ \
| * | Check for FF_ONLY merges correctlyRobin Rosenberg2013-01-292-2/+41
| |/
* | Merge changes Ife0cc2da,If38507efRobin Rosenberg2013-01-284-30/+833
|\ \
| * | Speed up PathFilterGroup for large sets of pathsRobin Rosenberg2013-01-213-30/+643
| * | Add test case for PathFilterGroupRobin Rosenberg2013-01-211-0/+190
| |/
* | Merge changes I25204d9e,Ia10d76e9Matthias Sohn2013-01-242-1/+14
|\ \
| * | Attempt to stabilize GCTestRobin Rosenberg2013-01-231-0/+11
| * | Attempt to stabilize FileTreeIterator test on WindowsRobin Rosenberg2013-01-231-1/+3
| |/
* | Merge "Reduce memory held and speed up DfsGarbageCollector."Colby Ranger2013-01-222-7/+18
|\ \
| * | Reduce memory held and speed up DfsGarbageCollector.Colby Ranger2013-01-222-7/+18
* | | Enable marking entries using TreeFilters in DiffEntryRobin Stocker2013-01-235-4/+285
* | | Add new committersMatthias Sohn2013-01-231-0/+6
* | | Update to jsch 0.1.46Matthias Sohn2013-01-232-2/+2
* | | Merge "Fix NPE FS_Win32 when looking up git executable and home directory avo...Matthias Sohn2013-01-221-3/+13
|\ \ \ | |_|/ |/| |
| * | Fix NPE FS_Win32 when looking up git executable and home directoryTobias Pfeifer2013-01-101-3/+13
* | | Merge "Improve handling of checkout conflicts"Robin Rosenberg2013-01-204-50/+106
|\ \ \
| * | | Improve handling of checkout conflictsMarkus Duft2013-01-114-50/+106
* | | | Merge changes I7e7fae12,I87ecca00Robin Rosenberg2013-01-194-36/+212
|\ \ \ \
| * | | | Add conflicts message before footerStefan Lay2013-01-192-6/+61
| * | | | Only replace the ChangeId in the footer, not in the bodyStefan Lay2013-01-192-30/+151
* | | | | 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-195-7/+32
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix patch application WRT windows line endings.Markus Duft2013-01-195-7/+32
| | |/ / / | |/| | |
* | | | | Merge "Update DfsGarbageCollector to not read back a pack index."Colby Ranger2013-01-186-32/+89
|\ \ \ \ \