Skip to content

Instantly share code, notes, and snippets.

View xml's full-sized avatar

Christian (Xian) Lilley xml

View GitHub Profile
@xml
xml / turt.sh
Last active April 13, 2018 23:42
Git: Catch Up Trunk and Rebase against Trunk
# Add these scripts to your .profile or .bash_profile or .zshrc, or wherever you shell-script
# (FWIW, I keep core scripts in my .profile, then import .profile into zsh or bash configs)
# PURPOSE:
# When developing, you want to develop a critical reflex/hygiene:
# keeping your working/feature branch updated against your trunk branch.
# But this takes time and attention, partly because your working branch can have an arbitrary name to remember/type.
# We want to "make the right thing the easy thing." (h/t: Mike Bland)
# These convenience scripts turn that process into a one-command operation.
@xml
xml / master_catchup.sh
Created April 25, 2017 05:46
Shell Script for Git: Update Master and Return to Current Branch
function mu() {
branch=`git rev-parse --symbolic-full-name --abbrev-ref HEAD`
echo "After updating master, will return to $branch..."
git checkout master
#TO-DO: check status and only pull if not up-to-date...
git pull
git checkout $branch
}
@xml
xml / font-awesome-vars-mixins.scss
Created September 30, 2015 15:06
A collection of utility mixins and variables for using font-awesome (or any similar icon-font) with SASS (in SCSS syntax). Requires that Font-Awesome be installed already. Inspired by @mbreit: https://gist.github.com/mbreit/4267177
// INSPIRED BY: https://gist.github.com/mbreit/4267177
@mixin font-awesome-base {
// USE: just set-up an element to use FontAwesome as its font
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
display: inline-block;
text-decoration: inherit;
line-height: 1;
}
@xml
xml / dabblet.css
Created April 17, 2013 11:10 — forked from pedrodelgallego/dabblet.css
Untitled
.container {
position: relative;
left: 100px;
margin: 200px auto;
width: 500px;
height: 500px;
}
.circle {