summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update last release version to 2.3.1.201302201838-rMatthias Sohn2013-02-241-1/+1
* Deploy Maven artifacts to Eclipse Nexus repositoryMatthias Sohn2013-02-232-3/+22
* Implement recursive merge strategyGeorge C. Young2013-02-2212-94/+1301
* Fix off by one error in PackReverseIndex.Colby Ranger2013-02-201-2/+2
* Merge branch 'stable-2.3'Matthias Sohn2013-02-214-22/+90
|\
| * Prepare 2.3.2-SNAPSHOT buildsstable-2.3Matthias Sohn2013-02-2139-211/+211
| * JGit v2.3.1.201302201838-rv2.3.1.201302201838-rMatthias Sohn2013-02-2139-212/+212
| * Merge "Accept Change-Id even if footer contains not well-formed entries" into...Matthias Sohn2013-02-202-21/+76
| |\
| | * Accept Change-Id even if footer contains not well-formed entriesStefan Lay2013-02-202-21/+76
| * | Fix false positives in hashing used by PathFilterGroupRobin Stocker2013-02-202-1/+14
| |/
* | Must use double single quotes around parametersRobin Rosenberg2013-02-161-5/+5
* | Add the --branch flag to the jgit clone commandRobin Rosenberg2013-02-163-2/+17
* | Merge "Prepare 2.4.0-SNAPSHOT builds"Matthias Sohn2013-02-1339-212/+212
|\ \
| * | Prepare 2.4.0-SNAPSHOT buildsMatthias Sohn2013-02-1439-212/+212
* | | Merge "Cleanup unused imports"Robin Rosenberg2013-02-130-0/+0
|\ \ \ | |/ / |/| |
| * | Cleanup unused importsRobin Rosenberg2013-02-141-4/+0
* | | 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
|\ \