index
:
jgit.git
master
master%private
next
servlet-4
stable-0.10
stable-0.11
stable-0.12
stable-0.7
stable-0.8
stable-0.9
stable-1.0
stable-1.1
stable-1.2
stable-1.3
stable-2.0
stable-2.1
stable-2.2
stable-2.3
stable-3.0
stable-3.1
stable-3.2
stable-3.3
stable-3.4
stable-3.5
stable-3.6
stable-3.7
stable-4.0
stable-4.1
stable-4.10
stable-4.11
stable-4.2
stable-4.3
stable-4.4
stable-4.5
stable-4.6
stable-4.7
stable-4.8
stable-4.9
stable-5.0
stable-5.1
stable-5.10
stable-5.11
stable-5.12
stable-5.13
stable-5.2
stable-5.3
stable-5.4
stable-5.5
stable-5.6
stable-5.7
stable-5.8
stable-5.9
stable-6.0
stable-6.1
stable-6.10
stable-6.2
stable-6.3
stable-6.4
stable-6.5
stable-6.6
stable-6.7
stable-6.8
stable-6.9
stable-7.0
stable-7.1
stable-7.2
stable-7.3
stable-7.4
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit
www-data
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
org.eclipse.jgit.test
/
tst
/
org
/
eclipse
/
jgit
/
api
/
MergeCommandTest.java
Commit message (
Expand
)
Author
Age
Files
Lines
*
Fix CommitCommand not to destroy repo
Christian Halstrick
2013-05-11
1
-0
/
+27
*
Add the no-commit option to MergeCommand
Tomasz Zarna
2013-04-04
1
-0
/
+125
*
Indicate initial commit on a branch in the reflog
Robin Rosenberg
2013-04-02
1
-2
/
+2
*
Move base test classes to the junit bundle for reuse for Java 7 tests
Robin Rosenberg
2013-02-04
1
-1
/
+1
*
Fix Check for FF_ONLY merges again
Robin Rosenberg
2013-01-29
1
-22
/
+35
*
Check for FF_ONLY merges correctly
Robin Rosenberg
2013-01-29
1
-0
/
+39
*
Declare essentially static methods as static
Robin Rosenberg
2012-12-27
1
-3
/
+3
*
Use assertEquals instead of == for literal primitives
Robin Rosenberg
2012-09-16
1
-2
/
+2
*
Fix order of deletion for files/dirs in ResolveMerger
Robin Stocker
2012-06-23
1
-0
/
+45
*
Add "--squash" option to MergeCommand
Tomasz Zarna
2012-06-15
1
-1
/
+188
*
Fix MergeCommandTest to pass if File.executable is not supported
Robin Rosenberg
2011-12-15
1
-4
/
+12
*
Fix ResolveMerger not to add paths with FileMode 0
Christian Halstrick
2011-12-11
1
-0
/
+75
*
Test the reflog message for commit, cherry-pick, revert and merge
Robin Rosenberg
2011-09-21
1
-1
/
+36
*
Fix ClassCastException in MergeCommand
Denys Digtiar
2011-08-21
1
-0
/
+31
*
Merge doesn't remove empty folders
Tomasz Zarna
2011-07-13
1
-0
/
+41
*
Create a MergeResult for deleted/modified files
Bernard Leach
2011-05-19
1
-0
/
+42
*
Implemented merge for parallel delete/modification
Bernard Leach
2011-05-03
1
-0
/
+63
*
Add "Conflicts" section to merge message on conflict
Robin Stocker
2011-04-06
1
-0
/
+32
*
Improve MergeResult
Philipp Thun
2011-03-21
1
-4
/
+11
*
Refactor test cases
Philipp Thun
2011-03-21
1
-27
/
+0
*
Abort merge when file to be checked out is dirty
Philipp Thun
2011-03-18
1
-0
/
+158
*
Refactor ResolveMerger
Philipp Thun
2011-03-18
1
-0
/
+4
*
Adapt expected commit message in tests
Robin Stocker
2011-02-02
1
-2
/
+2
*
Convert all JGit unit tests to JUnit 4
Robin Rosenberg
2010-12-31
1
-0
/
+22
*
Fixed Merge Algorithm regarding concurrent file creations
Christian Halstrick
2010-12-02
1
-0
/
+79
*
Fix bug regarding handling of non-versioned files during merge
Christian Halstrick
2010-11-22
1
-0
/
+50
*
Fix broken MergeCommandTest
Matthias Sohn
2010-11-10
1
-2
/
+2
*
Fixed ResolveMerger regarding handling of deletions
Christian Halstrick
2010-11-07
1
-0
/
+42
*
Add a test for merging deleted files
Christian Halstrick
2010-11-03
1
-0
/
+52
*
Refactor Git API exceptions to a new package
Chris Aniszczyk
2010-09-01
1
-0
/
+1
*
Added merge strategy RESOLVE
Christian Halstrick
2010-08-31
1
-36
/
+264
*
Make Commit class only for writing
Shawn O. Pearce
2010-08-20
1
-2
/
+2
*
Rename Repository getWorkDir to getWorkTree
Shawn O. Pearce
2010-06-25
1
-9
/
+9
*
Add a merge command to the jgit API
Stefan Lay
2010-05-24
1
-0
/
+183