Google Git
Sign in
cobalt / pre-commit-hooks / b13ff9b8681d39e6581ce8327d02ce906f022948 / pre_commit_hooks / check_merge_conflict.py
  1. b13ff9b adjust error outputs to be more standardized by Anthony Sottile · 3 years, 1 month ago
  2. 8f61529 drop python3.6 support by Anthony Sottile · 3 years, 4 months ago
  3. 39ab2ed replace exit(main()) with raise SystemExit(main()) by Anthony Sottile · 3 years, 7 months ago
  4. 07af540 Adjust git dir when checking for merge in worktree by Ersin Yildirim · 3 years, 7 months ago
  5. f5c42a0 pre-commit-hooks: python3.6+ by Anthony Sottile · 5 years ago
  6. fea76b9 Fix CI by upgrading AP templates by Anthony Sottile · 5 years ago
  7. 030bfac Apply typing to all of pre-commit-hooks by Anthony Sottile · 6 years ago
  8. 64b9f3d Added --assume-in-merge option for check-merge-conflict by Vinay Karanam · 7 years ago
  9. 2a902e0 Use asottile/add-trailing-comma by Anthony Sottile · 8 years ago
  10. 6076fd1 Support rebase conflicts in check-merge-conflicts by Anthony Sottile · 8 years ago
  11. 70e405e Add a new hook to forbid new submodules by Anthony Sottile · 8 years ago
  12. 4a01f64 Fix check-merge-conflict against binary files by Anthony Sottile · 9 years ago
  13. 5c75293 Refactor check-merge-conflicts tests by Alexander Dupuy · 10 years ago
  14. eefc46f Don't report markup titles as merge conflicts by Alexander Dupuy · 10 years ago
  15. 635fa7d Only check merge conflicts on conflict commits by Anthony Sottile · 10 years ago
  16. 86d8446 Fix off by one error in line number enumeration by Guy Kisel · 10 years ago
  17. 779a429 Add check-merge-conflict hook by Guy Kisel · 10 years ago