Skip to content

Instantly share code, notes, and snippets.

View walles's full-sized avatar

Johan Walles walles

View GitHub Profile
@walles
walles / git_merge_meld.sh
Created February 2, 2012 18:51 — forked from mrenouf/git_merge_meld.sh
Merge helper script for using 'git mergetool' with meld, fixes http://stackoverflow.com/questions/7501666/
#!/bin/bash
# Handles proper use of Meld from Git.
#
# Instead of launching meld with $MERGED as the base revision, this
# script makes a copy of $BASE and handles copying the result back
# to $MERGED if the result was saved.
# As an extra tweak, it also presents branch names (if known) as
# the file name prefix, instead of just "LOCAL" and "REMOTE".
Serializing request to be sent to Jedi Object {id: "23118315d0055354db81a7746dc5fb87", lookup: "completions", path: undefined, source: "import subprocess↵↵s", line: 2…}
Serializing request to be sent to Jedi Object {id: "b6849f9cc4e2ddcb79a99d783444367a", lookup: "completions", path: undefined, source: "import subprocess↵↵su", line: 2…}
Serializing request to be sent to Jedi Object {id: "9dce507a70af5cc206489a7992053ec5", lookup: "completions", path: undefined, source: "import subprocess↵↵sub", line: 2…}
Deserealizing response from Jedi {"id": "23118315d0055354db81a7746dc5fb87", "results": [{"snippet": "abs$0", "rightLabel": "", "type": "builtin", "description": "abs(number) -> number\n\nReturn the absolute value of the argument."}, {"snippet": "all$0", "rightLabel": "", "type": "builtin", "description": "all(iterable) -> bool\n\nReturn True if bool(x) is True for all values x in the iterable.\nIf the iterable is empty, return True."}, {"snippet": "and$0", "rightLabel": "", "type": "keyword", "description": "
@walles
walles / tabletest.rst
Last active June 14, 2017 04:50
Test of Github rst table rendering

Grid table, no unicode:

Foo Bar
/ Good x Bad

Grid table, no unicode, preceeded by heading

@walles
walles / make-rebase-conflict.sh
Last active September 29, 2017 17:01
Creates a git rebase conflict and attempts to aid in resolution
#!/bin/bash
set -euo pipefail
WORKDIR=/tmp/difftest
rm -rf $WORKDIR
mkdir -p $WORKDIR
cd $WORKDIR
git init
@walles
walles / bazel-generate-eclipse-project.sh
Last active February 22, 2022 12:34 — forked from enriched/bazel-generate-eclipse-project.sh
Generate Eclipse project for Bazel workspace (works with vscode-java)
#!/usr/bin/env bash
set -euo pipefail
cd "$(bazel info workspace)"
WORKSPACE_NAME=$(basename "$PWD")
cat << EOF > ./.project
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>