diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2010-05-19 10:01:25 +0200 |
|---|---|---|
| committer | Christian Halstrick <christian.halstrick@sap.com> | 2010-05-21 01:49:46 +0200 |
| commit | 6ca9843f3ebbea152969a8b795efce1d4ff15dbf (patch) | |
| tree | 516f608960debe427e540912941b300ace2b033a /pom.xml | |
| parent | 3c667b328ae086dcbfe159a22b3c86779a4590e5 (diff) | |
| download | jgit-6ca9843f3ebbea152969a8b795efce1d4ff15dbf.tar.gz jgit-6ca9843f3ebbea152969a8b795efce1d4ff15dbf.zip | |
Added merge support to CommitCommand
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>
Diffstat (limited to 'pom.xml')
0 files changed, 0 insertions, 0 deletions