Skip to content

Instantly share code, notes, and snippets.

View Git.md

Git — Beyond the Basics

So, now that we've all moved beyond the question of "Do I need to use a version control system?" and with the luster wearing off the Great Git Migration and the rise of projects being run on enterprise systems like Github, what's next?

I know that when I was learning git, there was a period of time when I felt "Okay, that wasn't too bad. I think I get this git thing". Then I had to manually deal with a nasty merge conflict, try to find one commit we did months ago in a dead branch, undo the commit a secure token to our repo, and on and on…

Git is phenomenal in its power to help both individuals and teams, but there's more to it than clone, pull, and push. The next "level" of commands often seem a bit more mysterious. I've heard many people say, "Well, just use 'rebase', or 'revert' or one of those, I can never remember which. Let's Google something and see if we get an answer!" (Okay, well, that was me n

View setups.sh
#!/usr/bin/env bash
# This script will be run to install multiple versions of Drupal related software
# in building up a VirtualMachine for NEDCamp 2016
# The original basis of this script was a gist written by Jonathan Webb to install
# multiple versions of PHP using phpevn and brew
# https://gist.github.com/webbj74/4151020ef4f642fa80a6
# Check OS
@eporama
eporama / phpupdate.sh
Last active Apr 22, 2017
A bash script to brew update php and relink in phpenv
View phpupdate.sh
#!/usr/bin/env bash
# Use this script to update multiple versions of PHP
versions=(56 70);
echo "Updating brew"
brew update
for version in ${versions[@]}
@eporama
eporama / phpenv-osx.sh
Last active Oct 14, 2017 — forked from webbj74/phpenv-osx.sh
Setup multiple versions of PHP on OSX using homebrew
View phpenv-osx.sh
#!/usr/bin/env bash
# Use this script to install or re-install multiple versions of PHP
# You should be able to re-run the script multiple times; it will update/reinstall what it needs.
# Check OS
if [ "${OSTYPE//[0-9.]/}" != "darwin" ]; then
echo "This script is intended for OSX users."
exit
View gist:b6123f78a210ba41c598
{
"name": "acquia/cloudflare-support",
"description": "Acquia Cloudflare tools",
"license": "proprietary",
"repositories": [
{
"type": "vcs",
"url": "https://github.com/jamesryanbell/cloudflare"
}
],
View gist:a8eb2f23e6982409108e
<?php
define("USER", "epor...");
define("PASSWORD", "jDey...");
define("SITE", "eporama");
define("ENV", "dev");
define("REALM", "devcloud"); // use devcloud for ACP and free tier, 'prod' for ACE
define("DB", "eporama");
define("LOCAL_PATH", "/Users/erik.peterson/backups/");
@eporama
eporama / gist:c6edeb3082eda64ff0f2
Last active Aug 29, 2015
memcache simplesamlphp config
View gist:c6edeb3082eda64ff0f2
<?php
// All custom changes below. Modify as needed.
// Defines account specific settings.
// Set some security and other configs that are set above, however we
// overwrite them here to keep all changes in one area
$config['technicalcontact_name'] = "Your Name";
$config['technicalcontact_email'] = "your_email@yourdomain.com";
// Change these for your installation
View responsive_blog_styles.css.patch
diff --git a/style.css b/style.css
index 7161ca4..627cdfc 100644
--- a/style.css
+++ b/style.css
@@ -69,7 +69,7 @@ body {
}
#wrapper {
margin: 0 auto 2em;
- max-width: 1000px;
+ max-width: 1090px;
You can’t perform that action at this time.