Skip to content

Instantly share code, notes, and snippets.

@cvan
Created May 15, 2012 22:31
Show Gist options
  • Save cvan/2705637 to your computer and use it in GitHub Desktop.
Save cvan/2705637 to your computer and use it in GitHub Desktop.
best workflow
# Django
z='cd ~/Sites/projects/zamboni2 && workon z'
zpull="z && git checkout master && git pull && git submodule update && git submodule --quiet foreach 'git submodule --quiet sync && git submodule update --init --recursive'"
zup='zpull && ./vendor/src/schematic/schematic migrations'
[alias]
get = "!f() { echo Merging $1 && git checkout master && git pull && git submodule sync && git submodule update --recursive && git checkout $1 && git rebase master && git checkout master && git merge $1; }; f"
@wraithan
Copy link

wraithan commented Sep 6, 2012

This is mine that I use regularly

alias ztest='FORCE_DB=1 ./manage.py test --logging-clear-handlers --noinput'
[alias]
subpull = !git pull --rebase && git submodule sync && git submodule update --init --recursive

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment