Skip to content

Instantly share code, notes, and snippets.

View madprog's full-sized avatar

Paul Morelle madprog

  • Odoo
  • Ramillies, Belgium
View GitHub Profile
@madprog
madprog / git-rebase-list.sh
Created March 14, 2014 15:01
Example of a way to pass a list of commits to rebase -i
#!/bin/sh
base=$1
shift
git checkout $base
for commit in "$@"; do
git rebase -f --onto HEAD $commit~1 $commit~0
if [ $? -ne 0 ]; then
echo "\x1b[31mFailed rebasing $commit onto HEAD.\nPlease resolve the conflicts and finish the rebasing.\nNon-zero exit will stop the process.\x1b[0m"
$SHELL
if [ $? -ne 0 ]; then
@madprog
madprog / _.md
Created August 27, 2013 10:41
FSS canvas example