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.pgm
/
src
/
org
/
eclipse
/
jgit
/
pgm
/
Merge.java
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge: Avoid non-localised literal string warning for "recursive"
David Pursehouse
2019-01-21
1
-8
/
+5
*
pgm: Fix missing braces in Merge command
Matthias Sohn
2019-01-21
1
-10
/
+18
*
pgm: Handle exceptions in Merge command
Matthias Sohn
2019-01-21
1
-90
/
+100
*
Fix javadoc in org.eclipse.jgit.pgm
Matthias Sohn
2017-12-18
1
-0
/
+1
*
Organize imports
David Pursehouse
2016-11-14
1
-1
/
+1
*
Replace use of deprecated method Repository.getRef()
Matthias Sohn
2016-05-31
1
-2
/
+2
*
Null-annotated Ref class and fixed related compiler errors
Andrey Loskutov
2015-12-15
1
-3
/
+6
*
Null-annotated Repository class and fixed related compiler errors
Andrey Loskutov
2015-11-25
1
-1
/
+9
*
pgm: Open RevWalk and TreeWalk in try-with-resource
David Pursehouse
2015-10-01
1
-7
/
+8
*
pgm: Create instances of Git in try-with-resource
David Pursehouse
2015-10-01
1
-14
/
+15
*
Handle -m option for Merge command
Axel Richard
2014-08-30
1
-1
/
+8
*
Add missing usage texts for JGit commandline commands
Matthias Sohn
2013-09-09
1
-4
/
+8
*
Move org.eclipse.jgit.pgm's resource bundle to internal package
Matthias Sohn
2013-05-06
1
-0
/
+1
*
Make recursive merge strategy the default merge strategy
Matthias Sohn
2013-04-15
1
-1
/
+1
*
clean up merge squash and no-commit messages in pgm
Tomasz Zarna
2013-04-08
1
-0
/
+1
*
Detect and handle a checkout conflict during merge nicely
Robin Rosenberg
2013-04-08
1
-1
/
+13
*
Add the no-commit option to MergeCommand
Tomasz Zarna
2013-04-04
1
-1
/
+8
*
Mark non-externalizable strings as such
Robin Rosenberg
2012-12-27
1
-4
/
+4
*
Add a case statement for fast-forward merge
Robin Rosenberg
2012-11-25
1
-0
/
+1
*
Add support for --no-ff while merging
Tomasz Zarna
2012-11-16
1
-4
/
+55
*
Add --squash option to org.eclipse.jgit.pgm.Merge
Tomasz Zarna
2012-10-07
1
-1
/
+9
*
Remove uses of TextBuiltin.out in favor of outw
Robin Rosenberg
2012-09-23
1
-1
/
+1
*
Add tests for output result of merging -- org.eclipse.jgit.pgm.Merge
Tomasz Zarna
2012-09-17
1
-0
/
+2
*
Check for write errors in standard out and exit with error
Robin Rosenberg
2012-09-16
1
-9
/
+9
*
Typo in CLIText#unknownMergeStratey, should be #unknownMergeStrategy
Tomasz Zarna
2012-07-14
1
-1
/
+1
*
Merge in JGit CLI is missing break statement
Tomasz Zarna
2011-07-12
1
-0
/
+1
*
Added Merge command to the CLI
Christian Halstrick
2011-03-29
1
-0
/
+122