Skip to content

Instantly share code, notes, and snippets.

@ytnobody

ytnobody/git-bar

Created November 1, 2018 10:07
Show Gist options

  • Select an option

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

Select an option

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

Revisions

  1. ytnobody revised this gist Nov 1, 2018. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion git-bar
    View file
    Original file line number Diff line number Diff line change
    @@ -12,7 +12,7 @@ EOF

    keyword=$1; shift
    DST_BRANCH=$1; shift
    MEMOFILE=$HOME/.git-overlay
    MEMOFILE=$HOME/.git-bar

    if [ -z $keyword ] || [ -z $DST_BRANCH ] ; then
    help;
  2. ytnobody created this gist Nov 1, 2018.
    38 changes: 38 additions & 0 deletions git-bar
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,38 @@
    #!/bin/sh

    help () {
    cat <<EOF
    Usage:
    git-bar [keyword] [Dest Branch]
    EOF
    exit;
    }

    keyword=$1; shift
    DST_BRANCH=$1; shift
    MEMOFILE=$HOME/.git-overlay

    if [ -z $keyword ] || [ -z $DST_BRANCH ] ; then
    help;
    fi

    echo $keyword" ---> "$DST_BRANCH

    WORK_BRANCH="work/"$keyword
    BASE_BRANCH=`git branch | grep '*' | awk '{print($2);}'`

    git checkout $DST_BRANCH &&
    git pull &&
    git branch $WORK_BRANCH

    git checkout $BASE_BRANCH &&
    git log --date-order --reverse --pretty=format:"%H | %s" |
    grep "| "$keyword |
    awk '{print($1);}' > $MEMOFILE

    git checkout $WORK_BRANCH &&
    cat $MEMOFILE |
    awk '{print("git cherry-pick "$1);}' |
    sh