Skip to content
Snippets Groups Projects
Select Git revision
  • main
  • master default
  • 7.0.0.202409031743-jpms
  • 7.0.0-jpms-1
4 results

jgit

  • Clone with SSH
  • Clone with HTTPS
    • user avatar
    Added merge support to CommitCommand
    Christian Halstrick authored 
    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: default avatarChristian Halstrick <christian.halstrick@sap.com>
    6ca9843f
    History
    user avatar 6ca9843f
    History
    Name Last commit Last update