]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 67edd3e) | patch
Add a case statement for fast-forward merge 53/8853/1
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Sun, 25 Nov 2012 20:11:28 +0000 (21:11 +0100)
committerRobin Rosenberg <robin.rosenberg@dewire.com>
Sun, 25 Nov 2012 20:11:28 +0000 (21:11 +0100)
commit8b06c46e301e4b9df4b2f47d1e67fb4ab319ded5
treea03f8920505e7bee1d8ee8d89cf97b442dbce199tree | snapshot
parent67edd3eda77fb98673065501a2cf7c9d39db668ccommit | diff
Add a case statement for fast-forward merge

This case was ommitted. Treat the same as a non-fastworwad
merge.

Change-Id: Ia81e2430dfe04c3ce9b6e2f8fb4b6c646293a174
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit