Skip to content

Instantly share code, notes, and snippets.

@cbrammer

cbrammer/README

Created November 15, 2012 18:36
Download ZIP

Revisions

  1. cbrammer revised this gist Nov 15, 2012. 1 changed file with 5 additions and 0 deletions.
    5 changes: 5 additions & 0 deletions README
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,5 @@
    Add these files in a bin somewhere that is accessible via your PATH.

    In any repo you can run `crossmerge B1 B2` for example: `crossmerge dev test`

    To do this in all repos, to the parent directory of all the repos and run `mergeall dev test`
  2. cbrammer created this gist Nov 15, 2012.
    9 changes: 9 additions & 0 deletions crossmerge
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,9 @@
    #!/bin/sh

    git checkout $1
    git pull origin $1
    git checkout $2
    git pull origin $2
    git merge $1
    git push origin $2
    git checkout $1
    18 changes: 18 additions & 0 deletions mergeall
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,18 @@
    #!/bin/sh

    set -e
    set -x

    export B1=$1
    export B2=$2

    cd Achievements;crossmerge $B1 $B2;cd ..;
    cd admin;crossmerge $B1 $B2;cd ..;
    cd api;crossmerge $B1 $B2;cd ..;
    cd sketch;crossmerge $B1 $B2;cd ..;
    cd tempest;crossmerge $B1 $B2;cd ..;
    cd website-main;crossmerge $B1 $B2;cd ..;
    cd workout-manager;crossmerge $B1 $B2;cd ..;
    cd log-workout;crossmerge $B1 $B2;cd ..;
    cd program-manager;crossmerge $B1 $B2;cd ..;
    cd workout-translator;crossmerge $B1 $B2;cd ..;