Skip to content

Instantly share code, notes, and snippets.

@IanColdwater
IanColdwater / twittermute.txt
Last active April 22, 2024 17:26
Here are some terms to mute on Twitter to clean your timeline up a bit.
Mute these words in your settings here: https://twitter.com/settings/muted_keywords
ActivityTweet
generic_activity_highlights
generic_activity_momentsbreaking
RankedOrganicTweet
suggest_activity
suggest_activity_feed
suggest_activity_highlights
suggest_activity_tweet
ROUTE
ESCAPE, UPPATH (tree pull, lumber check), LOSTWOODS, KAKARIKO, RACE (library check), AQUADUCT, HYPECAVE, ICECAVE (left), FAKESWIM, HOBO
[money]+[mitt]?
CATFISH IF POSSIBLE [mitt]
WITCH [mushroom], ZORA [money, mitt], ZORA [flippers]
[bow] or low?
SASH 3, EASTERN 3 [5 open, 1 bow]
@jbenet
jbenet / simple-git-branching-model.md
Last active April 9, 2024 03:31
a simple git branching model

a simple git branching model (written in 2013)

This is a very simple git workflow. It (and variants) is in use by many people. I settled on it after using it very effectively at Athena. GitHub does something similar; Zach Holman mentioned it in this talk.

Update: Woah, thanks for all the attention. Didn't expect this simple rant to get popular.

(defvar reenable-paredit-modes
'(emacs-lisp-mode clojure-mode lisp-mode)
"Modes to automatically re-enable paredit for after fixing version-control conflict markers")
(put 'unresolved-conflict 'error-conditions '(unresolved-conflict error))
(put 'unresolved-conflict 'error-message "Unresolved conflict markers in file")
(defun mark-git-conflict-resolved ()
(interactive)
(when (apply #'derived-mode-p reenable-paredit-modes)
(paredit-mode t)) ;; will fail and abort if parens are unbalanced