Skip to content

Instantly share code, notes, and snippets.

@michalzielanski
michalzielanski / ASRock_QC5000-ITX
Created May 12, 2015 17:48
lm_sensors config for ASRock QC5000-ITX
chip "radeon-pci-0008"
label temp1 "GPU Temp"
chip "fam15h_power-pci-00c4"
label power1 "APU Power"
chip "k10temp-pci-00c3"
label temp1 "CPU Temp"
# http://lm-sensors.org/wiki/VoltageLabelsAndScaling
@mwise
mwise / README.md
Last active July 14, 2023 14:11
Git hook to prevent merging staging branch into master branch

To use this hook:

  • add the prepare-commit-msg file at .git/hooks/prepare-commit-msg and edit as needed
  • make it executable: chmod +x .git/hooks/prepare-commit-msg
  • disable fast-forward merges: git config branch.master.mergeoptions "--no-ff"
  • that's it!

NOTE: after a failed merge from a forbidden branch, the working tree will still be in a MERGING state. To discard the local working copy state, run: git reset --merge