]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1ca7c58) | patch
Add conflicts message before footer 30/9530/9
authorStefan Lay <stefan.lay@sap.com>
Wed, 9 Jan 2013 13:02:51 +0000 (14:02 +0100)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Sat, 19 Jan 2013 16:38:33 +0000 (11:38 -0500)
commit215a74ecebedba54c326f4dc51edb3795e807869
tree0959492a09d264476c686de05aa9f7cc09b34b88tree | snapshot
parent1ca7c581a326dab9418d3d3eb665e1f27f6ca8edcommit | diff
Add conflicts message before footer

In case of a conflict during cherry-pick or revert the commit message
was amended after the footer. This made the footer invalid. Many users
do not understand that they have to edit the commit message in order to
make it valid again.

Change-Id: I7e7fae125129e2a0d8950510550acda766531835
Bug: 367416
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeMessageFormatterTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit