Skip to content
Snippets Groups Projects
Forked from VTK / VTK
93847 commits behind, 57 commits ahead of the upstream repository.
  • Ben Boeckel's avatar
    11679f83
    commit-msg: Remove MERGE_HEAD check from msg_is_merge · 11679f83
    Ben Boeckel authored and Brad King's avatar Brad King committed
    When using "git commit --amend" to edit a merge commit message the
    MERGE_HEAD is long gone.  Also, some Git versions remove this file
    before the commit-msg hook is called.  In either case we should still
    allow long summary lines that start in 'Merge ' just as we do for
    'Revert '.
    11679f83
    History
    commit-msg: Remove MERGE_HEAD check from msg_is_merge
    Ben Boeckel authored and Brad King's avatar Brad King committed
    When using "git commit --amend" to edit a merge commit message the
    MERGE_HEAD is long gone.  Also, some Git versions remove this file
    before the commit-msg hook is called.  In either case we should still
    allow long summary lines that start in 'Merge ' just as we do for
    'Revert '.
commit-msg 4.04 KiB