As configured in my dotfiles.
start new:
tmux
start new with session name:
# Heroku .gems file | |
oauth | |
nokogiri |
[extensions] | |
# enable color extension | |
color = | |
# enable extdiff extension (Extended Diff) | |
hgext.extdiff = | |
[extdiff] | |
# configure extended diff to use colordiff (requires colordiff installed in your system) | |
cmd.cdiff = colordiff | |
opts.cdiff = -uprN |
The MIT License (MIT) | |
Copyright (c) 2015 J Kishore Kumar | |
Permission is hereby granted, free of charge, to any person obtaining a copy | |
of this software and associated documentation files (the "Software"), to deal | |
in the Software without restriction, including without limitation the rights | |
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
copies of the Software, and to permit persons to whom the Software is | |
furnished to do so, subject to the following conditions: |
As configured in my dotfiles.
start new:
tmux
start new with session name:
Using Python's built-in defaultdict we can easily define a tree data structure:
def tree(): return defaultdict(tree)
That's it!
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c
and [c
.
Choose which version you want to keep with :diffget //2
or :diffget //3
(the //2
and //3
are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
<?xml version="1.0" encoding="UTF-8"?> | |
<project name="Composer Targets" default="build"> | |
<property name="builddir" value="${basedir}/build"/> | |
<property name="composer" value="${builddir}/composer.phar"/> | |
<target name="php-check"> | |
<condition property="php" value="php"> | |
<not> | |
<isset property="${php}"/> |
defmodule LearningPorts do | |
def main do | |
parent = self() | |
# if we need to control STDIN, the fun begins: | |
# unfortunately we can't close the port's stdin without closing the port. | |
# so it'll block waiting forever for an EOF that'll never appear. | |
# | |
# so we use a wrapper program that allows us to specify a sentinel line |
rabbitmqctl add_user test test | |
rabbitmqctl set_user_tags test administrator | |
rabbitmqctl set_permissions -p / test ".*" ".*" ".*" |