]> source.dussan.org Git - gitblit.git/commit
projects / gitblit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b8633f8) | patch
Fixed bug in merge: improper use of force and failing on FORCED result
authorJames Moger <james.moger@gitblit.com>
Thu, 6 Mar 2014 19:32:08 +0000 (14:32 -0500)
committerJames Moger <james.moger@gitblit.com>
Thu, 6 Mar 2014 19:32:08 +0000 (14:32 -0500)
commitd2ab7a68e4c3f1e619af3576e1443afa2f98cdfd
tree78c89b4d30a0fb47e8fb1601f54918231f2e9d67tree | snapshot
parentb8633f8a62b4f605de0b0c035d2cf29b89164029commit | diff
Fixed bug in merge: improper use of force and failing on FORCED result
src/main/java/com/gitblit/utils/JGitUtils.java diff | blob | history
Pure java git solution: https://github.com/gitblit-org/gitblit