Skip to content

Instantly share code, notes, and snippets.

View fmalamitsas's full-sized avatar

Frédéric Malamitsas fmalamitsas

18 followers · 6 following
View GitHub Profile
@fmalamitsas
fmalamitsas / gist:5949271
Created July 8, 2013 14:24
http server
python -m SimpleHTTPServer 8000
@fmalamitsas
fmalamitsas / gitmerge
Created July 8, 2013 13:19
echo "git pull origin develop"
git pull origin develop
echo "git push origin develop"
git push origin develop
echo "git checkout master"
git checkout master
echo "git merge develop"
@fmalamitsas
fmalamitsas / gitdiff
Created July 8, 2013 13:18
MASTER=`git log --pretty=format:'%H' master | sort`
DEV=`git log --pretty=format:'%H' develop | sort`
for i in `diff <(echo "${MASTER}") <(echo "${DEV}") | grep '^>' | sed 's/^> //'`;
do
git --no-pager log -1 --oneline $i;
done
@fmalamitsas
fmalamitsas / gist:1130557
Created August 7, 2011 17:15
tag_users GET /tags/:tag_id/users(.:format) {:action=>"index", :controller=>"users"}
event_users GET /events/:event_id/users(.:format) {:action=>"index", :controller=>"users"}
product_users GET /products/:product_id/users(.:format) {:action=>"index", :controller=>"users"}
location_users GET /locations/:location_id/users(.:format) {:action=>"index", :controller=>"users"}
home_users GET /users/home(.:format) {:action=>"home", :controller=>"users"}
users GET /users(.:format) {:action=>"index", :controller=>"users"}
user GET /users/:id(.:format) {:action=>"show", :controller=>"users"}
@fmalamitsas
fmalamitsas / heroku_fs
Created January 22, 2011 11:29
t/.bundle/gems/ruby/1.9.1/gems/json_pure-1.4.6/lib/json/common.rb:146:in `parse': 705: unexpected token at '<!DOCTYPE html> (JSON::ParserError)
<html>
<head>
<title>Flying Sphinx</title>
<meta name="csrf-param" content="authenticity_token"/>
<meta name="csrf-token" content="zrIGtiIJXiMoZhaRKR8MVxha9ShWdtEriW6tb5H1Xv4="/>
<link href="/stylesheets/screen.css?1295667900" media="screen, projection" rel="stylesheet" type="text/css" />
<link href="/stylesheets/print.css?1295667900" media="print" rel="stylesheet" type="text/css" />
<!--[if IE]>
<link href="/stylesheets/ie.css?1295667900" media="screen, projection" rel="stylesheet" type="text/css" />
@fmalamitsas
fmalamitsas / gist:192830
Created September 24, 2009 16:22
export PS1='\u@\W $(git branch &>/dev/null; if [ $? -eq 0 ]; then \
echo "[\[\033[00m\]$(git branch | grep ^*|sed s/\*\ //)] "; fi)\$\[\033[00m\] '
@fmalamitsas
fmalamitsas / gist:192828
Created September 24, 2009 16:21
[color]e
branch = auto
diff = auto
status = auto
[color "branch"]
current = red
local = green
remote = yellow
[color "diff"]
meta = yellow bold
@fmalamitsas
fmalamitsas / gist:99049
Created April 21, 2009 09:42
imac-de-frederic:keldelice frederic$ rake spec --trace
(in /Users/frederic/Documents/keldelice)
** Invoke spec (first_time)
** Invoke db:test:prepare (first_time)
** Invoke db:abort_if_pending_migrations (first_time)
** Invoke environment (first_time)
** Execute environment
config.gem: Unpacked gem desert-0.3.1 in vendor/gems has no specification file. Run 'rake gems:refresh_specs' to fix this.
** Execute db:abort_if_pending_migrations
** Execute db:test:prepare
@fmalamitsas
fmalamitsas / gist:80548
Created March 17, 2009 13:36
InnoDB: Log scan progressed past the checkpoint lsn 11 2579045827
090317 14:33:30 InnoDB: Database was not shut down normally!
InnoDB: Starting crash recovery.
InnoDB: Reading tablespace information from the .ibd files...
InnoDB: Restoring possible half-written data pages from the doublewrite
InnoDB: buffer...
InnoDB: Doing recovery: scanned up to log sequence number 11 2579290531
090317 14:33:30 InnoDB: Starting an apply batch of log records to the database...
InnoDB: Progress in percents: 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 InnoDB: Database page corruption on disk or a failed
InnoDB: file read of page 572.
@fmalamitsas
fmalamitsas / gist:79904
Created March 16, 2009 14:33
FCKGW-RHQQ2-YXRKT-8TG6W-2B7Q8
Windows XP PRO Corporate serial number S/N: Key: MQPWW-PGVKX-YPMKG-8DH3G-KC8PW
windows xp home edition serial number S/N: 034634-262024-171505-828316-729010-413531-800424-400442
Windows XP 64 serial number S/N: B2RBK-7KPT9-4JP6X-QQFWM-PJD6G
Windows XP serial number S/N: K6C2K-KY62K-DQR84-RD4QV-QB74Q
Windows XP Professional 64-bit Corporate Edition 5.2.3790.1830 serial number S/N: VCFQD-V9FX9-46WVH-K3CD4-4J3JM
Microsoft Windows XP Professional SP2 serial number S/N: YY8F2-3CKVQ-RKTRG-6JMDR-9DTG6
Windows XP Professional Service Pack 1 sp1 serial number S/N: F46YY - 2R8VQ - R8GMY - 926VK - 6BQ73
Windows XP Pro serial number S/N: KBWR7-76BD8-J7MDQ-KKG&C-V9Q2J