Skip to content
Snippets Groups Projects
Select Git revision
  • passt default
  • master
  • pu
  • todo
  • next
  • maint
  • v2.8.0-rc1
  • v2.8.0-rc0
  • v2.7.2
  • v2.7.1
  • v2.7.0
  • v2.6.5
  • v2.7.0-rc3
  • v2.7.0-rc2
  • v2.7.0-rc1
  • v2.7.0-rc0
  • v2.6.4
  • v2.6.3
  • v2.6.2
  • v2.6.1
  • v2.3.10
  • v2.5.4
  • v2.4.10
  • v2.6.0
  • v2.6.0-rc3
  • v2.5.3
26 results

hooks--pre-commit

  • Junio C Hamano's avatar
    61c2bcbd
    pre-commit hook: complain about conflict markers. · 61c2bcbd
    Junio C Hamano authored
    
    Several <<< or === or >>> characters at the beginning of a line
    is very likely to be leftover conflict markers from a failed
    automerge the user resolved incorrectly, so detect them.
    
    As usual, this can be defeated with "git commit --no-verify" if
    you really do want to have those files, just like changes that
    introduce trailing whitespaces.
    
    Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
    61c2bcbd
    History
    pre-commit hook: complain about conflict markers.
    Junio C Hamano authored
    
    Several <<< or === or >>> characters at the beginning of a line
    is very likely to be leftover conflict markers from a failed
    automerge the user resolved incorrectly, so detect them.
    
    As usual, this can be defeated with "git commit --no-verify" if
    you really do want to have those files, just like changes that
    introduce trailing whitespaces.
    
    Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>