.bashrc

#....
# bashrc default content

# a function with two parameters to stash not indexed files with a message (param1) than checkout the requested branch (param 2)
git_stash_and_get_branch () {
    git stash save "stash for $1"
    git checkout $2
    git pull --rebase origin $2
}

# update the parent branch (param1), update the child branch (param2), than merge the first one on the second one
# When conflict, you have to resolve manually those one, index them (git add .) than commit (git commit) to end the merge process
git_update_branch1_from_branch2 () {
    echo "start checkouting and up to date the branch : $2"
    git checkout $2
    git pull --rebase origin $2
    echo "start checkouting and up to date the branch : $1"
    git checkout $1
    git pull --rebase origin NUMERIQUE-$1
    echo "start merging $2 on $1"
    git merge $2
}
##   ALIAS    ##
alias update_branch=git_update_branch1_from_branch2
alias stash_then_branch=git_stash_and_get_branch

alias graph_log=git log --pretty=oneline --abbrev-commit --graph
alias dlc=git diff --cached HEAD^
alias clean_local=git branch --merged master | grep -v "master$" | xargs -r git branch -d