- Toda alteração no git deve preceder de uma branch. Essa é sua branch privada
(dev/master)$ git checkout -b dev/nova_feat dev/master
ou(dev/master)$ git checkout -b dev/novo_bug dev/master
- Na sua branch local dê vários commits para registrar seu trabalho e entender o que vc mesmo está fazendo
(dev/nova_feat)$ git commit -am "linhas duplicadas no exemplo"
- Se precisar mande sua branch para o servidor
(dev/nova_feat)$ git push origin dev/nova_feat
- Se precisar mande sua branch para o servidor
- Quando concluir a funcionalidade mescle ela na branch pública(master ou dev) e seja bem descritivo em um único commit.
(dev/master)$ git merge --squash dev/nova_feat
git is a wonderful SCM, so is extremely important know about its right use. Spent some time reading the articles below contributes to a good code repository.
Start with github code school where you'll learn the basics commands for using git. If you want to understand in detail what each commands does read the official documentation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
function usage { | |
echo "usage: $0 hostname" | |
exit 0 | |
} | |
HOSTNAME=$1 | |
[ -z ${HOSTNAME} ] && usage |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Object files | |
*.o | |
# Libraries | |
*.lib | |
*.a | |
# Shared objects (inc. Windows DLLs) | |
*.dll | |
*.so |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
autoload -U compinit promptinit | |
compinit | |
promptinit; prompt gentoo | |
zstyle ':completion::complete:*' use-cache 1 | |
ZSH=$HOME/.oh-my-zsh | |
ZSH_THEME="gozilla" | |
DISABLE_CORRECTION="true" | |
plugins=(git ruby rails history virtualenv) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
if $TERM == "xterm-256color" | |
set t_Co=256 | |
endif | |
set nocompatible | |
filetype off | |
set rtp+=~/.vim/bundle/Vundle.vim | |
call vundle#begin() | |
Plugin 'VundleVim/Vundle.vim' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[user] | |
name = Guilherme Maluf | |
email = [email protected] | |
[color] | |
diff = auto | |
status = auto | |
branch = auto | |
[core] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# prefix is Ctrl-q | |
set -g prefix C-q | |
bind C-q send-prefix | |
bind-key C-q last-window | |
unbind C-b | |
set -sg escape-time 0 | |
set -g base-index 1 | |
setw -g pane-base-index 1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# vim:filetype=i3 | |
set $mod Mod4 | |
set $alt Mod1 | |
set $wallpaper $HOME/.config/wallpapers | |
set $terminal i3-sensible-terminal | |
font pango:Inconsolata 14 | |
# use Mouse+$mod to drag floating windows to their wanted position |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
ATRIBUTOS=() | |
function remove_min { | |
local total=0 | |
local dices=() | |
IFS=$'\n' | |
DICES=($(sort <<<"${ROLL[*]}")) |
OlderNewer