git-rama.md

Ramas

# Miro las ramas (la activa es verde *)
git branch


# Crear una rama y de paso cambia a esa rama
git checkout -b nombreramma

#
git commit -am "Dañando cosas."


# 
git push origin nombreramma 


# uniendo ramas me paro en master y me traigo lo que tenia en nombreramma
git checkout master
git merge nombreramma

nano ~/.bashrc

force_color_prompt=yes

if [ -n "$force_color_prompt" ]; then
    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
        # We have color support; assume it's compliant with Ecma-48
        # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
        # a case would tend to support setf rather than setaf.)
        color_prompt=yes
    else
        color_prompt=
    fi
fi

parse_git_branch() {
 git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
}

if [ "$color_prompt" = yes ]; then
    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(parse_git_branch)\[\033[00m\]\$ '
else
    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w$(parse_git_branch)\$ '
fi
unset color_prompt force_color_prompt

ssh

nano ~/.ssh/config



# Servidores de prueba
Host rio
    HostName 122.114.253.252
    User root
    Port 22222

Host arquipunto-prod
    HostName ec2-18-222-132-167.us-east-2.compute.amazonaws.com
    User ubuntu
    IdentityFile ~/.pem/arquipunto.pem

ssh-copy-id

rsync -avt script_rules_orpak.py rio:/opt/odoo