joallard

require "language/go"

class Pgfutter < Formula
  desc "Import CSV and JSON into PostgreSQL the easy way"
  homepage "https://github.com/lukasmartinelli/pgfutter"
  url "https://github.com/lukasmartinelli/pgfutter.git", :tag => "v1.1"
  sha256 ""

  depends_on "go" => :build

joallard

# <https://en.wikipedia.org/wiki/ANSI_escape_code>

# iTerm: Set title to 'foo'
puts "\e]0;Foo\a"
# equiv to
# puts "\033]0;Foo\007"

# Print 'foo' in green and reset
puts "\e[32;mfoo\e[0m boo"

joallard

This is not a true Demers cartogram; it lacks links between adjacent features. Instead of trying to preserve connectedness, this pseudo-cartogram tries to preserve locality, putting each square as close as possible to its origin without overlapping.

joallard

Keybase proof

I hereby claim:

• I am joallard on github.
• I am joallard (https://keybase.io/joallard) on keybase.
• I have a public key whose fingerprint is 795F 256C 46DA 3AB2 8E0F 99B6 7749 C3DF 2E21 EEC4

To claim this, I am signing this object:

joallard

<script>
  if(window.bullocks){
    console.log("woops!")
  }

  if(true){
    console.log("yes")
  }
</script>

joallard

sandyhill:dev-tmp jon$ mkdir bare.git && cd bare.git
sandyhill:bare.git jon$ git init --bare
Initialized empty Git repository in /Users/jon/dev-tmp/bare.git/
sandyhill:bare.git jon$ git config core.worktree ~/dev-tmp/bare-foo/
sandyhill:bare.git jon$ git config core.bare false
fatal: core.bare and core.worktree do not make sense
sandyhill:bare.git jon$ git --version 
git version 1.8.5.1
sandyhill:bare.git jon$ git config core.worktree 
fatal: core.bare and core.worktree do not make sense

joallard

Proposée par les Jeunes néodémocrates du Québec
Congrès de Montréal, 2013

ATTENDU que la protection des droits numériques est essentielle au développement d'une économie durable au 21e siècle;

IL EST RÉSOLU d'ajouter un alinéa 6.10, comme suit:

6.10 Droits dans l'ère numérique

joallard

javascript:(function(){var%20css=document.createElement('style');css.type='text/css';css.innerHTML='#webdiffContent>a>table:not(.highlightedTable){display:none;}';document.body.appendChild(css);})();

joallard

So, you've merged the master branch with itself, and you ended up with a merge commit nobody wanted.

The problem

Let me tell you a little story...

John and Pete are working together on a repo.

$ git log --graph --pretty=oneline --abbrev-commit  # an alias I have under 'git lol', but 'gitk' does just fine
* 812492b (master, origin/master, origin/HEAD) Add stuff

joallard

[alias]
  co = checkout
  lol = log --graph --decorate --pretty=oneline --abbrev-commit
  lola = log --graph --decorate --pretty=oneline --abbrev-commit --all

  # Show short status with current branch name
  st="!f() { br=$(git status | head -1) && echo "${br}" && git status -s; }; f"