| commit | 6ca9843f3ebbea152969a8b795efce1d4ff15dbf | |
| author | Christian Halstrick <christian.halstrick@sap.com> | |
| Wed, 19 May 2010 08:01:25 +0000 (19 10:01 +0200) | ||
| committer | Christian Halstrick <christian.halstrick@sap.com> | |
| Thu, 20 May 2010 23:49:46 +0000 (21 01:49 +0200) | ||
| tree | 516f608960debe427e540912941b300ace2b033a | treesnapshot (tar.gz zip) |
| parent | 3c667b328ae086dcbfe159a22b3c86779a4590e5 | commitdiff |
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>
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>