- On the PR branch
git rebase -i master
(i.e.git rebase -i {parent_commit_of_first_commit_in_PR}
)- Change top commit (the oldest) to
reword
- Change all other commits to
fixup
- In commit message (line 1) change title to reflect entire PR
- In commit message (line 2) add
Closes #n
and/orFixes #n
- In commit message (line 3) add
Authors: @integralist
git checkout master
git merge {PR_branch}
orgit cherry-pick {new_rebased_commit}
git branch -D {PR_branch}
# Examples taken from ThoughtBot's Weekly Iteration | |
# We need to implement a solution that allows us to cleanly use two separate APIs | |
# Our fake APIs | |
PayPal.charge!(auth_code, 25) | |
Stripe::CreditCard.new(credit_card_token).charge(25) |
var toHexString = function (r, g, b) { | |
return (toHexString = _toHexString)(r,g,b); | |
function _toHexString(r, g, b) { | |
return "#" + toHexByte(r) + toHexByte(g) + toHexByte(b); | |
} | |
function toHexByte(bite) { | |
var hex = bite.toString(16); | |
return (hex.length === 2 ? hex : "0" + hex); | |
} | |
}; |
// ==UserScript== | |
// @name Sensible defaults for jsFiddle. | |
// @author Mathias Bynens <http://mathiasbynens.be/> | |
// @link http://mths.be/bde | |
// @match http://jsfiddle.net/* | |
// ==/UserScript== | |
// Ignore existing fiddles | |
if (window.location.pathname == '/') { |
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE | |
Version 2, December 2004 | |
Copyright (C) 2011 @louis_remi <http://louisremi.com> | |
Everyone is permitted to copy and distribute verbatim or modified | |
copies of this license document, and changing it is allowed as long | |
as the name is changed. | |
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE |
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE | |
Version 2, December 2004 | |
Copyright (C) 2011 Timo Kissing http://kissing.name | |
Everyone is permitted to copy and distribute verbatim or modified | |
copies of this license document, and changing it is allowed as long | |
as the name is changed. | |
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE |
var cat = {}; | |
/** | |
* cat.NewsBox | |
* Retrieves news from Google | |
*/ | |
cat.NewsBox = (function(){ | |
function NewsBox(searchTerm, injectFn) { | |
this.searchTerm = searchTerm; |
https://developer.mozilla.org/en/Determining_the_dimensions_of_elements
Get dimensions that include everything except margin space (so borders + padding):
offsetWidth
and offsetHeight
Get dimensions for just content:
clientWidth
and clientHeight
Get dimensions of total height (regardless if any part is clipped/hidden):
scrollWidth
and scrollHeight
#Overview - setting up our git workflow
This set-up works for our team as we don't mind pushing directly to a development
branch, but this wouldn't work for other companies as the development branch could potentially get broken fairly quickly and with multiple developers working on this singular branch would be awkward to locate issues and fix - but for a small team this seems to work fine.
##Initial User Set-Up The first developer to work on the new project will go through this process:
-
<github>
Create repository on GitHub company account -
``
Below is how I am currently structuring my CSS to be more object-oriented (with a little assistence from Sass):
- Base
- Helpers
- Variables (see my Guide to Sass)
- Mixins (careful and limited usage - see my Guide to Sass)
- Extensions (careful and limited usage - see my Guide to Sass)
- Layout