Skip to content

Instantly share code, notes, and snippets.

@tiembo
tiembo / gist:7123828
Created October 23, 2013 18:19
For Git - don't prompt to edit message when merging (from http://stackoverflow.com/questions/12752288)
git config --global core.mergeoptions --no-edit
@tiembo
tiembo / gist:6705113
Last active December 23, 2015 22:39
To prevent merge bubbles during a git pull, use git pull --rebase. Here's a git config change to automatically rebase a specific branch.
git config branch.<branch name>.rebase true
@tiembo
tiembo / gist:1680416
Created January 26, 2012 01:52
Ubuntu laptop A/C unplugging suspend fix
# run in command line
gsettings set org.gnome.settings-daemon.plugins.power 'use-time-for-policy' 'false'