Skip to content

Instantly share code, notes, and snippets.

# Purpose: manually associate missed renames in merge conflicts
# Usage: git merge-associate <our-target> <base> <theirs>
# Example: After a failed rename detection A/a -> B/b which results
# in CONFLICT (delete/modify) for A/a and corresponding "deleted by us"
# messages in git status, the following invocation can be used to manually
# establish the link:
* Copyright 2013 Disqus, Inc.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
function clone (t) -- deep-copy a table
if type(t) ~= "table" then return t end
local meta = getmetatable(t)
local target = {}
for k, v in pairs(t) do
if type(v) == "table" then
target[k] = clone(v)
target[k] = v
This code snippet was found on Stack Overflow
import urllib2
MattSeen /
Last active December 29, 2015 17:29 — forked from turadg/
A bash script for allow tab completion of rake tasks.
# bash completion for rake
# some code from on Jonathan Palardy's
# and found
# For details and discussion
MattSeen / .gitconfig
Last active April 30, 2024 09:20
These are a series of the Git alias I use on use on a daily basis. I have included references to the places where I have found each one to give the authors due credit.
# Source:
# Found on stackoverflow list all available aliases ==
alias = config --get-regexp '^alias.*'
s = status
ss = status --short
ssb = status --short --branch
co = commit