index
:
jgit.git
master
master%private
next
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
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
/
src
/
org
/
eclipse
/
jgit
/
merge
/
Merger.java
Commit message (
Expand
)
Author
Age
Files
Lines
*
Fix exception on conflicts with recursive merge
Robin Stocker
2013-12-03
1
-20
/
+9
*
Add missing @since tags
Matthias Sohn
2013-03-22
1
-0
/
+2
*
Implement recursive merge strategy
George C. Young
2013-02-22
1
-11
/
+33
*
Allow applications to pass ObjectInserter to Merger
Shawn O. Pearce
2012-06-14
1
-0
/
+19
*
Move JGitText to an internal package
Robin Rosenberg
2012-03-12
1
-1
/
+1
*
Ensure the ObjectInserter flushes after a merge
Shawn O. Pearce
2011-10-26
1
-1
/
+4
*
Fix ClassCastException in MergeCommand
Denys Digtiar
2011-08-21
1
-1
/
+1
*
Add getBaseCommit() to Merger
Christian Halstrick
2010-08-26
1
-3
/
+22
*
Use ObjectReader in RevWalk, TreeWalk
Shawn O. Pearce
2010-06-28
1
-7
/
+7
*
Release ObjectInserter in merge() not mergeImpl()
Shawn O. Pearce
2010-06-28
1
-1
/
+6
*
Replace WindowCache with ObjectReader
Shawn O. Pearce
2010-06-25
1
-2
/
+2
*
Start using ObjectInserter instead of ObjectWriter
Shawn O. Pearce
2010-06-25
1
-6
/
+6
*
Externalize strings from JGit
Sasa Zivkov
2010-05-19
1
-4
/
+5
*
Initial JGit contribution to eclipse.org
Git Development Community
2009-09-29
1
-0
/
+235