6ca9843f3e
The CommitCommand should take care to create a merge commit if the file $GIT_DIR/MERGE_HEAD exists. It should then read the parents for the merge commit out of this file. It should also take care that when commiting a merge and no commit message was specified to read the message from $GIT_DIR/MERGE_MSG. Finally the CommitCommand should remove these files if the commit succeeded. Change-Id: I4e292115085099d5b86546d2021680cb1454266c Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> |
||
---|---|---|
.. | ||
.settings | ||
META-INF | ||
exttst/org/eclipse/jgit | ||
tst/org/eclipse/jgit | ||
tst-rsrc/org/eclipse/jgit | ||
.classpath | ||
.gitignore | ||
.project | ||
build.properties | ||
org.eclipse.jgit.core--All-External-Tests (Java 6).launch | ||
org.eclipse.jgit.core--All-External-Tests.launch | ||
org.eclipse.jgit.core--All-Tests (Java 6).launch | ||
org.eclipse.jgit.core--All-Tests.launch | ||
plugin.properties | ||
pom.xml |