aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org
Commit message (Expand)AuthorAgeFilesLines
* NetRC parser and credentials provider.Alexey Kuznetsov2014-08-031-0/+191
* Add IndexDiff tests for merge conflict state BOTH_ADDEDLaurent Goubet2014-08-021-0/+116
* IndexDiffFilter should never filter entries with stage!=0Christian Halstrick2014-08-021-0/+25
* Fix RevertCommand to correctly revert multiple commits at once.Maik Schreiber2014-07-301-0/+100
* Remove overlapping submodules from repo manifest.Yuxuan 'fishy' Wang2014-07-291-0/+59
* Merge "RecursiveMerger should not fail on content-merge conflicts of parents"Christian Halstrick2014-07-291-0/+83
|\
| * RecursiveMerger should not fail on content-merge conflicts of parentsChristian Halstrick2014-07-281-0/+83
* | Strip trailing /s in repo base URI.Yuxuan 'fishy' Wang2014-07-281-1/+1
|/
* Fix RecursiveMerger's internal use of merge to find a merge baseChristian Halstrick2014-07-251-1/+179
* Handle initial checkout correctlyChristian Halstrick2014-07-251-0/+19
* Preserve merges during pull if configured to do soKonrad Kügler2014-07-151-0/+207
* Rebase: Add --preserve-merges supportKonrad Kügler2014-07-151-0/+278
* Cherry-Pick: Support --no-commitKonrad Kügler2014-07-141-2/+46
* Handle diff formatting when there is nothing to compare withRobin Rosenberg2014-07-061-0/+78
* Eliminate warning about overlapping variable namesRobin Rosenberg2014-07-041-5/+5
* Merge branch 'stable-3.4'Matthias Sohn2014-06-211-1/+33
|\
| * Allow retrying connecting SshSession in case of an exceptionStefan Lay2014-06-201-1/+33
* | Rename RewriteTreeFilter to TreeRevFilter and make it publicDave Borowitz2014-06-121-0/+188
* | Merge "Unit test for the updating behavior in RepoCommand API."Shawn Pearce2014-05-271-47/+148
|\ \
| * | Unit test for the updating behavior in RepoCommand API.Yuxuan 'fishy' Wang2014-05-271-47/+148
| |/
* / Remove a bit of repetition and casting in PackFileTestRoberto Tyley2014-05-261-7/+4
|/
* Allow to include untracked files in stash operations.Andreas Hermann2014-05-222-4/+133
* Fix for reflog corruption caused by multiline messageAndreas Hermann2014-05-221-0/+96
* Improve layout of branches in the commit graphKonrad Kügler2014-05-221-52/+347
* Adds support for SPNEGOLaurent Goujon2014-05-211-0/+9
* Merge "Cherry-Pick: Support --mainline to pick merges"Robin Rosenberg2014-05-191-0/+58
|\
| * Cherry-Pick: Support --mainline to pick mergesKonrad Kügler2014-05-171-0/+58
* | Fix a number of failing conflict situationsRobin Rosenberg2014-05-171-1/+1
* | Merge "Archive: Add the ability to select one or more paths."Robin Rosenberg2014-05-171-0/+211
|\ \ | |/ |/|
| * Archive: Add the ability to select one or more paths.Shaul Zorea2014-05-141-0/+211
* | Handle repo copyfile in bare repositories.Yuxuan 'fishy' Wang2014-05-091-1/+39
* | Handle the revision attribute in repo manifest.Yuxuan 'fishy' Wang2014-05-091-6/+125
* | Handle repo submodules for bare repositories.Yuxuan 'fishy' Wang2014-05-071-0/+41
|/
* RevWalk: Allow disabling parent rewritingDave Borowitz2014-05-051-0/+94
* blame: Fix merges, where merge result differs only by whitespaceKonrad Kügler2014-05-031-0/+31
* Fix push to repo with non-fetched refsJean-Jacques Lafay2014-04-301-1/+70
* Add methods to Repository to handle remote namesRobin Rosenberg2014-04-271-0/+46
* Merge changes Ia4df9808,I83e8a321,Id0e7663b,Ib809b00c,I88a6ee07Shawn Pearce2014-04-251-0/+240
|\
| * Added implementation of copyfile rule.Yuxuan 'fishy' Wang2014-04-231-0/+35
| * Added groups support to repo subcommand.Yuxuan 'fishy' Wang2014-04-231-6/+118
| * Implemented first part of the repo sub-command.Yuxuan 'fishy' Wang2014-04-231-0/+93
* | Remove streaming delta support from JGitDoug Kelly2014-04-242-372/+66
|/
* Blame correctly in the presence of conflicting mergesKonrad Kügler2014-04-171-0/+70
* Merge changes Id9a641dd,If2ee1f42Robin Rosenberg2014-04-091-0/+80
|\
| * Added TestCase for 7d5e1f Fixed RevWalk.isMergedInto()Sven Selberg2014-04-091-0/+80
* | Fix ValidRefNameTest on WindowsRobin Rosenberg2014-04-061-23/+55
* | Fix FileTreeIteratorTest#testIsModifiedFileSmudged() on WindowsRobin Rosenberg2014-04-061-0/+5
* | Fix ObjectChecker when normalization is enabledShawn Pearce2014-04-031-2/+11
* | Interactive rebase: Fix order of commit messages on squashStefan Lay2014-03-271-5/+5
* | Fix GarbageCollection not to pack HEADChristian Halstrick2014-03-261-0/+68