dittoalex

README

Short excursion into git --track, --set-upstream and --set-upstream-to.

All examples use the aliases co for checkout and br for branch.

Setup:

$ git clone [email protected]:AKSW/OntoWiki.git

Table Of Content

Skip to the relevant sections if needed.

2-min tutorial to do it the quick-and-dirty-way
Concepts for resolving Git conflicts
Setting up different editors / tool for using git mergetool
- Finding out what mergetool editors are supported
mergetool simple code example for vimdiff
- Resolving conflict from a Git pull
Other great references and tutorials

Firefox bullshit removal

Due to the incessant swarm of complete and utter nonsense that has been forcing its way into Firefox over time, I've decided to start collecting my personal list of “must-have” about:config tweaks required to turn Firefox into a functional brower.

NOTE: Unfortunately this is somewhat out of date. The comments link to some resources that may be more up-to-date. Patches welcome.

WebSockets

These can be used for nefarious purposes and to bypass access restrictions.

Go to https://developer.apple.com/downloads/index.action and search for "Command line tools" and choose the one for your Mac OSX
Go to http://brew.sh/ and enter the one-liner into the Terminal, you now have brew installed (a better Mac ports)
Install transmission-daemon with
```
brew install transmission
```

Copy the startup config for launchctl with

ln -sfv /usr/local/opt/transmission/*.plist ~/Library/LaunchAgents

To use this bot:

Download ads_bot.py and requirements.txt.
Type pip install -r requirements.txt to install the requirements.
Fill out the required information in the Python file.
Ideally, create a (free) Slack account and set up a web hook to receive notifications from the bot.
Run the script :)
Relax and be ready to answer incoming calls :D

	#!/bin/bash
	# Installs the XCode command line tools if you don't have them
	xcode-select --install
	# Installs brew if you don't have it
	/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
	# Makes your account the owner of /usr/local, which is preferred on single user Macs
	sudo chown -R `whoami` /usr/local
	# Installs all the dependencies for building libtorrent and rtorrent
	brew install automake libtool boost curl lzlib libsigc++ openssl pkg-config xmlrpc-c
	# Uninstall libtorrent-rasterbar if you already have it

	require 'octokit'
	require 'csv'
	require 'hashie'
	require 'active_support/all'

	class PR < Hashie::Dash
	property "pr"
	property "created_at"
	property "comment_count"
	property "commit_count"

	{
	"Statement": [
	{
	"Effect": "Allow",
	"Action": [
	"s3:GetBucketLocation",
	"s3:GetObject",
	"s3:ListBucket"
	],
	"Resource": [

	cd into /tmp/kitchen.
	/opt/chef/embedded/bin/gem install chef-zero
	/opt/chef/embedded/bin/chef-zero -d
	knife cookbook upload -a -c client.rb
	chef-shell -z -c client.rb -o '<YOUR RECIPE>'