summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable-1.0'Matthias Sohn2011-06-0211-1/+2192
|\
| * Prepare post v1.0.0.201106011211-rc3 buildsMatthias Sohn2011-06-014-3/+3
| * JGit v1.0.0.201106011211-rc3v1.0.0.201106011211-rc3Matthias Sohn2011-06-014-3/+3
| * Remove incubation markerMatthias Sohn2011-05-311-1/+1
| * blame: Compute the origin of lines in a result fileShawn O. Pearce2011-05-3110-0/+2191
* | Fix a complicated multi level nested if block structure to use a single level...Ketan Padegaonkar2011-05-311-36/+35
* | Merge branch 'stable-1.0'Shawn O. Pearce2011-05-315-52/+72
|\|
| * Change EditList to extend ArrayListShawn O. Pearce2011-05-311-50/+6
| * Ensure the HTTP request is fully consumedShawn O. Pearce2011-05-313-0/+48
| * Fix CloneCommand not to fetch into remote tracking branches when bareChristian Halstrick2011-05-311-2/+18
* | CleanCommand: add the ability to do a dry runAbhishek Bhatnagar2011-05-311-1/+15
|/
* Fix usage of FileSnapshot in RefDirectoryChristian Halstrick2011-05-312-23/+24
* Merge "Use the stored password instead of prompting for it all the time"Matthias Sohn2011-05-252-3/+13
|\
| * Use the stored password instead of prompting for it all the timeCarsten Pfeiffer2011-05-242-3/+13
* | DHT: Add sequence RefDataShawn O. Pearce2011-05-251-5/+6
* | Merge "Let RefDirectory use FileSnapShot to handle fast updates"Chris Aniszczyk2011-05-252-24/+55
|\ \
| * | Let RefDirectory use FileSnapShot to handle fast updatesChristian Halstrick2011-05-232-24/+55
* | | Add a DiffFormatter which calculates a patch-idStefan Lay2011-05-243-9/+184
* | | Add CleanCommandTest and fix CleanCommandAbhishek Bhatnagar2011-05-241-5/+6
* | | Add CleanCommand to JGit APIAbhishek Bhatnagar2011-05-242-0/+123
|/ /
* | Add shortening of note ref names to NoteMapKevin Sawicki2011-05-231-0/+13
* | Remove rebase temporary files on checkout failureBernard Leach2011-05-231-2/+9
|/
* Add LsRemoteCommand to JGit APIChristoph Brill2011-05-194-0/+200
* Create a MergeResult for deleted/modified filesBernard Leach2011-05-191-0/+12
* Add reset with paths support to ResetCommandBernard Leach2011-05-191-1/+78
* Fix NPE in URIish when parsing an empty URIKetan Padegaonkar2011-05-192-0/+16
* Implement rebase ff for upstream branches with merge commitsChris Aniszczyk2011-05-182-53/+64
* Fix path filtering in LogCommandPiotr Janik2011-05-181-1/+4
* Merge "Optimize MergeAlgorithm if ours or theirs is empty"Robin Rosenberg2011-05-171-0/+31
|\
| * Optimize MergeAlgorithm if ours or theirs is emptyChristian Halstrick2011-05-171-0/+31
* | Merge "Fix diff bug on inserted line"Stefan Lay2011-05-161-1/+1
|\ \
| * | Fix diff bug on inserted lineShawn O. Pearce2011-05-161-1/+1
* | | Add getConflicting() method in Status APIPiotr Janik2011-05-161-0/+8
|/ /
* | Merge "Fix diff when first text is the start of the other"Shawn Pearce2011-05-151-1/+1
|\ \
| * | Fix diff when first text is the start of the otherRobin Rosenberg2011-05-151-1/+1
* | | Add RebaseResult.FAST_FORWARD_RESULTChris Aniszczyk2011-05-131-0/+3
* | | RevertCommand: Add "." after reverted commit idRobin Stocker2011-05-131-1/+1
| |/ |/|
* | Merge "Formatter for relative dates"Christian Halstrick2011-05-093-0/+166
|\ \
| * | Formatter for relative datesMatthias Sohn2011-05-093-0/+166
* | | Remove unused serialVersionUID from non-serializable classes.Kevin Sawicki2011-05-082-2/+0
|/ /
* / Fix getHumanishName broken for windows pathsStefan Lay2011-05-061-1/+7
|/
* IndexDiff: conflicting files aren't properly shownBernard Leach2011-05-051-6/+9
* Ignore submodule commits during checkoutRobin Rosenberg2011-05-051-0/+6
* Merge "Fix "into" part of merge message for HEAD"Shawn Pearce2011-05-051-2/+1
|\
| * Fix "into" part of merge message for HEADRobin Stocker2011-05-051-2/+1
* | Store Git on any DHTShawn O. Pearce2011-05-054-3/+46
|/
* Present reset in the reflog like C Git does nowadaysRobin Rosenberg2011-05-041-2/+1
* Implemented merge for parallel delete/modificationBernard Leach2011-05-031-0/+23
* Merge "Attempt to make git prefix detection more reliable"Chris Aniszczyk2011-05-031-3/+55
|\
| * Attempt to make git prefix detection more reliableRobin Rosenberg2011-05-021-3/+55