]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7a504b8) | patch
Fix RepositoryState.MERGING 09/1509/1
authorJens Baumgart <jens.baumgart@sap.com>
Thu, 2 Sep 2010 16:01:47 +0000 (18:01 +0200)
committerJens Baumgart <jens.baumgart@sap.com>
Thu, 2 Sep 2010 16:01:47 +0000 (18:01 +0200)
commitf714988c61bc188fd5e9ce6a848e4f19690f48a5
treeea76064f41caea8ffc14d9f4024234b13536cff9tree | snapshot
parent7a504b8d7cf7a329774993ea94776a76886e4017commit | diff
Fix RepositoryState.MERGING

canResetHead now returns true.
Resetting mixed / hard works in EGit in merging state.

Change-Id: I1512145bbd831bb9734528ce8b71b1701e3e6aa9
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit