Skip to content

Instantly share code, notes, and snippets.

View walles's full-sized avatar

Johan Walles walles

View GitHub Profile
@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"?>
@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".