Skip to content

Commit

Permalink
Updated rollin sound file again
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Keller committed Aug 20, 2015
1 parent 7f43309 commit 4c9a751
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
[alias]
lg = log --color --graph --pretty=format:'%cd - %s' --abbrev-commit --date=short
up = "!git remote update -p; git merge --ff-only @{u}"
roll = "!CURRENT=$(git rev-parse --abbrev-ref HEAD) && git checkout ${1} && git merge ${CURRENT} && git push origin ${1} && git checkout ${CURRENT} && git status && bash -c 'wget -O- -q https://bitbucket.org/alexfisher/compro_config/src/master/media/rollin.wav | aplay'"
roll = "!CURRENT=$(git rev-parse --abbrev-ref HEAD) && git checkout ${1} && git merge ${CURRENT} && git push origin ${1} && git checkout ${CURRENT} && git status && bash -c 'wget -O- -q https://bitbucket.org/alexfisher/compro_config/src/master/media/rollin.au | aplay'"
2 changes: 1 addition & 1 deletion .gitignore_global
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ sites/*/private
nbproject
.svn
*.komodoproject
*.sass-cache
.sass-cache
.vagrant
.idea
node_modules
Binary file added media/rollin.au
Binary file not shown.
Binary file removed media/rollin.wav
Binary file not shown.

0 comments on commit 4c9a751

Please sign in to comment.