2787 shaares
# Merge
mtm = mergetool -t meld # Merge using meld
# Merge-request
# Create branch of merge request id.
# Usage: "git mr upstream 1"
# "git mr upstream 1 -bis" # Third parameter is for multiple code review
mr = !sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2$3 && git checkout mr-$1-$2$3' -
parse_git_branch() {
git branch 2> /dev/null | sed -e '/^[^]/d' -e 's/ (.*)/ (\1)/'
}
PS1='${debian_chroot:+($debian_chroot)}[\e[1;32m]\u@\h[\e[00m] [\e[01;34m]\w[\e[33m]$(parse_git_branch) [\e[34m]\$[\e[00m] '
