Skip to content

Instantly share code, notes, and snippets.

@idris

idris/gmo

Last active August 29, 2015 13:56
Download ZIP

Revisions

  1. idris revised this gist Jun 13, 2014. 1 changed file with 1 addition and 5 deletions.
    6 changes: 1 addition & 5 deletions gmo
    View file
    Original file line number Diff line number Diff line change
    @@ -1,6 +1,2 @@
    #!/bin/bash
    function parse_git_branch_bare {
    git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
    }

    git merge -m "Merge #$1 from $2 into $(parse_git_branch_bare)" origin/$2
    git merge -m "Merge #$1 from $2 into $(git symbolic-ref --short HEAD)" origin/$2
  2. idris created this gist Feb 6, 2014.
    6 changes: 6 additions & 0 deletions gmo
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,6 @@
    #!/bin/bash
    function parse_git_branch_bare {
    git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
    }

    git merge -m "Merge #$1 from $2 into $(parse_git_branch_bare)" origin/$2