Skip to content

Instantly share code, notes, and snippets.

@rud

rud/ship.sh

Forked from reinh/ship.sh
Created May 4, 2009 19:42
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save rud/106621 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save rud/106621 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. rud revised this gist Feb 22, 2011. 1 changed file with 5 additions and 3 deletions.
    8 changes: 5 additions & 3 deletions ship.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -1,7 +1,9 @@
    #!/bin/sh -x
    # Exit if any error is encountered:
    set -o errexit
    # git name-rev is fail
    CURRENT=`git branch | grep '\*' | awk '{print $2}'`
    git checkout master || exit 1
    git merge ${CURRENT} || exit 1
    git checkout master
    git merge ${CURRENT}
    git push origin master
    git checkout ${CURRENT} || exit 1
    git checkout ${CURRENT}
  2. rud renamed this gist Dec 29, 2010. 1 changed file with 0 additions and 0 deletions.
    0 gistfile1.sh → ship.sh
    View file
    File renamed without changes.
  3. rud revised this gist May 4, 2009. 1 changed file with 7 additions and 7 deletions.
    14 changes: 7 additions & 7 deletions gistfile1.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -1,7 +1,7 @@
    #!/bin/sh -x
    # git name-rev is fail
    CURRENT=`git branch | grep '\*' | awk '{print $2}'`
    git checkout master
    git merge ${CURRENT}
    git push origin master
    git checkout ${CURRENT}
    #!/bin/sh -x
    # git name-rev is fail
    CURRENT=`git branch | grep '\*' | awk '{print $2}'`
    git checkout master || exit 1
    git merge ${CURRENT} || exit 1
    git push origin master
    git checkout ${CURRENT} || exit 1
  4. @reinh reinh revised this gist Nov 25, 2008. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion gistfile1.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -1,6 +1,6 @@
    #!/bin/sh -x
    # git name-rev is fail
    CURRENT=`git branch | grep "\*" | awk "{print $2}"`
    CURRENT=`git branch | grep '\*' | awk '{print $2}'`
    git checkout master
    git merge ${CURRENT}
    git push origin master
  5. @reinh reinh revised this gist Aug 29, 2008. 1 changed file with 2 additions and 1 deletion.
    3 changes: 2 additions & 1 deletion gistfile1.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -1,5 +1,6 @@
    #!/bin/sh -x
    CURRENT=`git name-rev HEAD --name-only`
    # git name-rev is fail
    CURRENT=`git branch | grep "\*" | awk "{print $2}"`
    git checkout master
    git merge ${CURRENT}
    git push origin master
  6. @reinh reinh revised this gist Aug 28, 2008. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion gistfile1.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -1,5 +1,5 @@
    #!/bin/sh -x
    CURRENT=`git branch | grep "\*" | awk "{print $2}"`
    CURRENT=`git name-rev HEAD --name-only`
    git checkout master
    git merge ${CURRENT}
    git push origin master
  7. @reinh reinh created this gist Aug 28, 2008.
    6 changes: 6 additions & 0 deletions gistfile1.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,6 @@
    #!/bin/sh -x
    CURRENT=`git branch | grep "\*" | awk "{print $2}"`
    git checkout master
    git merge ${CURRENT}
    git push origin master
    git checkout ${CURRENT}