Skip to content

Instantly share code, notes, and snippets.

View klj613's full-sized avatar

Kristian Lewis Jones klj613

View GitHub Profile
applications:
- name: 'project1'
changed_when:
- './project1/*'
jobs:
include:
- name: "project1-fast-tests"
if: "project1 IN changed_applications"
- name: "project1-slow-tests"
@klj613
klj613 / rebase-git-flow.txt
Created September 21, 2012 21:24
Rebase git flow
Rebasing Git Flow
=================
TL;DR
-----
- All feature branches are rebased to latest master
- All staging branches are rebased to latest master
- All finalized feature branches are rebased then --no-ff merged into a staging branch
- All staging branches gets signed off and tested before --no-ff into master
@klj613
klj613 / gittips.md
Created September 4, 2012 16:12
Git Tips

...

  • treeish: anything which references a commit (e.g. branch, HEAD, HEAD10, master15, SHA)

git show <treeish>:<file>

Displays file from a specific commit

git checkout <treeish> -- <file>

Checkout a file from a specific commit

e.g.

@klj613
klj613 / php-cmd.bat
Created September 15, 2011 01:00
XAMPP PHP CLI on windows
@for /F "delims=" %%I in ("%~dp0") do @set xampp_install_root=%%~fI
@set PATH=%xampp_install_root%\php;%PATH%
@start %COMSPEC%