Why am I told I'm ahead of origin/master
by 1 commit
?
Why does it go away after what appears to be a no-op git push
?
Here's an example interaction with git
:
dave@machine ~/dev/project > git status
// | |
// FlickDynamics.h | |
// (c) 2009 Dave Peck <davepeck [at] davepeck [dot] org> | |
// http://davepeck.org/ | |
// | |
// This code is released under the BSD license. If you use my code in your product, | |
// please put my name somewhere in the credits and let me know about it! | |
// | |
// This code mimics the scroll/flick dynamics of the iPhone UIScrollView. | |
// What's cool about this code is that it is entirely independent of any iPhone |
// | |
// BinaryDataScanner.m | |
// | |
// Copyright 2009 Dave Peck <davepeck [at] davepeck [dot] org>. All rights reserved. | |
// http://davepeck.org/ | |
// | |
// This class makes it quite a bit easier to read sequential binary files in Objective-C. | |
// | |
// This code is released under the BSD license. If you use it in your product, please | |
// let me know and, if possible, please put me in your credits. |
#!/bin/bash | |
open "http://www.yubnub.org/parser/parse?command=$(echo -n "$*")" |
#!/bin/sh | |
## script POMODORO for OSX! ## | |
# # | |
# requires the GNU gdate command to format dates # | |
# it's available through macports, in the coreutils package # | |
# this script also requires Growl to display notifications # | |
# # | |
# Times are coded as follows: # | |
# @ long break : 30 minutes # |
Foo bar
biz bazz!
import re | |
from scrapy.link import Link | |
from urlparse import urljoin | |
from BeautifulSoup import BeautifulSoup | |
class SoupLinkExtractor(object): | |
def __init__(self, *args, **kwargs): | |
super(SoupLinkExtractor, self).__init__() | |
allow_re = kwargs.get('allow', None) |
/* call processNextArchiveEntry in some kind of loop! */ | |
- (int)processNextArchiveEntry:(struct archive *)archive | |
{ | |
struct archive_entry *entry = NULL; | |
int result = ARCHIVE_OK; | |
result = archive_read_next_header(archive, &entry); | |
if (result == ARCHIVE_OK) | |
{ |
unless Rails.env.production? | |
module ActiveModel | |
class IllegalMassAssignment < StandardError | |
end | |
module MassAssignmentSecurity | |
module Sanitizer | |
def warn!(invalid_keys) | |
raise ActiveModel::IllegalMassAssignment, "You attempted to mass-assign: #{invalid_keys.join(', ')}" | |
end |
#!/usr/bin/env python | |
import sys | |
import yaml | |
import json | |
# Assumed we want to use stdin and stdout | |
print json.dumps(yaml.load(sys.stdin.read()), indent=4) | |