mirrors
/
jgit
Mirror von https://github.com/eclipse/jgit.git
Beobachten 1
Favorisieren 0
Fork 0
Code Issues 0 Releases 204 Wiki Aktivität
4726 Commits
49 Branches
Branch: stable-4.5
Branches Tags
${ item.name }
Erstelle Branch ${ searchTerm }
von „stable-4.5“
${ noResults }
Commit graph

58 Commits (stable-4.5)

Autor SHA1 Nachricht Datum
  Masaya Suzuki edd8ad4d04 Use FS#lastModified instead of File#lastModified vor 7 Jahren
  Shawn Pearce 591e39bf9d Revert "Fix warnings about unchecked conversion of MergeResult" vor 8 Jahren
  David Pursehouse 979fa19110 Fix warnings about unchecked conversion of MergeResult vor 8 Jahren
  David Pursehouse 3adea9ac7f RecursiveMergerTest: Open TreeWalk and BufferedReader in try-with-resource vor 8 Jahren
  David Pursehouse 8074f50b58 ResolveMergerTest: Open Git in try-with-resource vor 8 Jahren
  David Pursehouse d882bf8c4d SquashMessageFormatterTest: Open git in try-with-resource vor 8 Jahren
  Jonathan Nieder 5be4814e38 Repository: Introduce exactRef and findRef, deprecate getRef vor 9 Jahren
  Christian Halstrick 1196dd0643 Fix ResolveMerger when files should be replaced by folders vor 9 Jahren
  Matthias Sohn 1cd2a0697d Access static member LocalDiskRepositoryTestCase.CONTENT directly vor 9 Jahren
  André de Oliveira 3cd7d0d85a Do not add a newline at the end if neither merged side had one vor 9 Jahren
  Christian Halstrick 2bd3556e7e Fix RecursiveMerger in case of multiple, independent base commits vor 9 Jahren
  Jonathan Nieder 5967b65838 Revert "CommitBuilder should check for duplicate parents" vor 9 Jahren
  Christian Halstrick 6bc48cdc62 CommitBuilder should check for duplicate parents vor 12 Jahren
  Christian Halstrick 3b031fe3dc RecursiveMerger should not fail on content-merge conflicts of parents vor 10 Jahren
  Christian Halstrick 0c4553d28a Fix RecursiveMerger's internal use of merge to find a merge base vor 10 Jahren
  Robin Rosenberg fd62a45649 Fix merge/cherry-picking in CRLF mode vor 10 Jahren
  Robin Rosenberg ff83f54d29 Failing to delete a directory with untracked content is actually ok vor 10 Jahren
  Shawn Pearce d54d19740a Move SampleDataRepositoryTestCase to org.eclipse.jgit.test vor 10 Jahren
  Shawn Pearce f32b861243 JGit 3.0: move internal classes into an internal subpackage vor 11 Jahren
  Robin Rosenberg 3cd089f04c A folder does not constitute a dirty work tree vor 11 Jahren
  George C. Young ab99b78ca0 Implement recursive merge strategy vor 11 Jahren
  Robin Rosenberg 767be14f34 Move base test classes to the junit bundle for reuse for Java 7 tests vor 11 Jahren
  Stefan Lay 215a74eceb Add conflicts message before footer vor 11 Jahren
  Robin Rosenberg a57dd1c164 Declare essentially static methods as static vor 11 Jahren
  Robin Stocker 54aceb1769 Pull up method for creating DirCacheEntry into RepositoryTestCase vor 11 Jahren
  Christian Halstrick 37ab3ffdaf Refactor ResolveMergerTest to allow testing multiple strategies vor 11 Jahren
  Robin Rosenberg 2531d939e4 Add the intended file to avoid breakage vor 11 Jahren
  Robin Rosenberg 476e1d2ff1 cleanup: Prefer assertEquals over assertTrue(....equals(...)) vor 11 Jahren
  Christian Halstrick 778fdfaec1 Again teach ResolveMerger to create more correct DirCacheEntry's vor 12 Jahren
  Shawn Pearce 955b024995 Revert "Teach ResolveMerger to create more correct DirCacheEntry's" vor 12 Jahren
  Markus Duft 3ea694c252 Teach ResolveMerger to create more correct DirCacheEntry's vor 12 Jahren
  Robin Stocker 028434e4f5 Don't return success on failing paths in ResolveMerger vor 12 Jahren
  Tomasz Zarna 2656ac1b5a Add "--squash" option to MergeCommand vor 12 Jahren
  Robin Stocker 8456cb3f2b Adapt merge message to C Git for remote-tracking branch vor 12 Jahren
  Christian Halstrick 0461ff4f0c Optimize MergeAlgorithm if ours or theirs is empty vor 13 Jahren
  Robin Stocker 7546e3b4c5 Fix "into" part of merge message for HEAD vor 13 Jahren
  Shawn O. Pearce ef822fe3cd Remove deprecated Repository.mapTree vor 13 Jahren
  Robin Stocker b0245b548b Don't print "into HEAD" when merging refs/heads/master vor 13 Jahren
  Robin Rosenberg b3e59bd9d6 Implement a revert command vor 13 Jahren
  Robin Rosenberg d9e07a574a Convert all JGit unit tests to JUnit 4 vor 13 Jahren
  Christian Halstrick 12a5c8d413 Change default diff algorithm to histogram and add tests vor 13 Jahren
  Christian Halstrick 049827d708 Make diff algorithm configurable vor 13 Jahren
  Robin Stocker 6290ca3a63 Format merge commit messages like C Git vor 13 Jahren
  Christian Halstrick 99771f04bc Fixed merge algorithm regarding adjacent modifications vor 13 Jahren
  Christian Halstrick e8642b538c Cleaned up MergeAlgorithmTest vor 13 Jahren
  Christian Halstrick beeb1f6d08 Fix Severe Bug in Merge Algorithm vor 13 Jahren
  Shawn O. Pearce 67263e2056 Refactor diff sequence API vor 13 Jahren
  Christian Halstrick 0c017188b4 Improve MergeAlgorithm to produce smaller conflicts vor 13 Jahren
  Shawn O. Pearce 6df5d3397c Move commit and tag formatting to CommitBuilder, TagBuilder vor 13 Jahren
  Shawn O. Pearce 22b285695a Rename Commit, Tag to CommitBuilder, TagBuilder vor 13 Jahren