3741 Commits (11a0dffd16e998959e3145de9c48dbdaf8f9757b)
 

Author SHA1 Message Date
Kevin Sawicki d2fa3987a0 Use bitcheck to check for presence of OPT_FULL option 11 years ago
Robin Stocker 93530625cf Enhance BranchConfig API to expose branch.* options 11 years ago
Laurent Goubet 1fd150d565 Add IndexDiff tests for merge conflict state BOTH_ADDED 11 years ago
Christian Halstrick ddbf67e058 IndexDiffFilter should never filter entries with stage!=0 11 years ago
Robin Rosenberg fd07ee54ef Merge "HistogramDiff: Convert stack recursion to heap managed queue" 11 years ago
Robin Stocker 66909cd7a6 Fix Javadoc errors with Java 8 11 years ago
Christian Halstrick adbf0541dc Fix API errors raised on ResolveMerger affecting API providers only 11 years ago
Matthias Sohn efce340474 Implement RepoCommand.Project.hashCode() since we override equals() 11 years ago
Matthias Sohn 56fdbadc76 Remove @Override annotation illegal for interfaces on Java 5 11 years ago
Matthias Sohn 9b157c6dab Mark package org.eclipse.jgit.gitrepo.internal as x-internal 11 years ago
Andrey Loskutov 3a161ac467 Small performance optimization for ignore rules/fnmatcher 11 years ago
Andrey Loskutov 0307123e5a Added toString() methods for better debugging of ignore rules 11 years ago
Maik Schreiber 7ff1e0d8f5 Fix RevertCommand to correctly revert multiple commits at once. 11 years ago
Shawn Pearce 7b0ee393ba Merge "Remove overlapping submodules from repo manifest." 11 years ago
Yuxuan 'fishy' Wang a9b9c5b324 Remove overlapping submodules from repo manifest. 11 years ago
Shawn Pearce 219b9045f4 Merge "Added the missing export in MANIFEST.MF." 11 years ago
Christian Halstrick 5171a1843a Merge "RecursiveMerger should not fail on content-merge conflicts of parents" 11 years ago
Yuxuan 'fishy' Wang 73d38bfb33 Strip trailing /s in repo base URI. 11 years ago
Christian Halstrick 3b031fe3dc RecursiveMerger should not fail on content-merge conflicts of parents 11 years ago
Christian Halstrick 289b7c60a9 Fixed message for exception thrown during recursive merge 11 years ago
Shawn Pearce d11ca1b084 HistogramDiff: Convert stack recursion to heap managed queue 11 years ago
Christian Halstrick 0c4553d28a Fix RecursiveMerger's internal use of merge to find a merge base 11 years ago
Christian Halstrick cf9b01b09a Handle initial checkout correctly 11 years ago
Yuxuan 'fishy' Wang c7adc0c91c Added the missing export in MANIFEST.MF. 11 years ago
Robin Stocker f3fc379757 Update SUBMITTING_PATCHES 11 years ago
Robin Rosenberg fd58cbcdee Don't prefix output from jgit status with '# ' 11 years ago
Konrad Kügler 48544e27ae Preserve merges during pull if configured to do so 11 years ago
Konrad Kügler e0fbae5dc3 Rebase: Add --preserve-merges support 11 years ago
Konrad Kügler b9a0077062 Repository.writeMergeHeads to accept a list with subtypes of ObjectId 11 years ago
Konrad Kügler 0f679dbda5 Cherry-Pick: Support --no-commit 11 years ago
Robin Rosenberg 89ad10ec27 Handle diff formatting when there is nothing to compare with 11 years ago
Robin Rosenberg 71c18201c1 Eliminate warning about overlapping variable names 11 years ago
Robin Rosenberg a03bdcbbb4 Don't warn for methods that can be static 11 years ago
Robin Rosenberg 8032b64980 Add new default settings from Eclipse 4.4 11 years ago
Matthias Sohn 6b0503c0c2 Merge "Clarify comments in message properties files (and fix grammar)" 11 years ago
Robin Rosenberg 0f14d3bf40 Try to fix intermittent test failure related to file timestamps 11 years ago
Robin Stocker 26e0c533d0 Clarify comments in message properties files (and fix grammar) 11 years ago
Robin Stocker 10aee9b1b7 Fix incorrect "''" in CLIText.properties 11 years ago
Robin Rosenberg 844739baa1 Add a comment to the message properties files on how they are processed 11 years ago
Robin Rosenberg 5054f36d4b Fix spelling error in error messgae 11 years ago
Robin Rosenberg a9cd45cbd8 Remove duplicate string in CLIText.properties 11 years ago
Robin Rosenberg 350ba91585 Fix formatting errors in error messages 11 years ago
Matthias Sohn 64dde09b85 Merge branch 'stable-3.4' 11 years ago
Matthias Sohn 7865d7100e Prepare 3.4.2-SNAPSHOT builds 11 years ago
Matthias Sohn 03f6e83c40 JGit v3.4.1.201406201815-r 11 years ago
Stefan Lay 4b2b3294b8 Allow retrying connecting SshSession in case of an exception 11 years ago
Robin Rosenberg 79792c59b6 Remove no longer needed API breakage filters 11 years ago
Robin Rosenberg 78cd2bb9e0 Remove an unnecessary semicolon 11 years ago
Robin Rosenberg 447fd6a948 Remove an unnecessary $NON-NLS$ comment 11 years ago
Robin Rosenberg be025ff7d2 Merge "Enable NLS / TranslationBundle to be used in OSGi" 11 years ago