Skip to content

Instantly share code, notes, and snippets.

View guimaluf's full-sized avatar

Guilherme Maluf Balzana guimaluf

View GitHub Profile

Git Workflow Resumo

  • 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
  • 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
@guimaluf
guimaluf / Git Workflow.md
Last active July 3, 2019 11:54
Simple beginner to master git workflow; Simple mastering git

git Workflow

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.

I know nothing about git

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

I'm used to git, but the only branch I know is master

@guimaluf
guimaluf / certgen
Last active June 13, 2017 18:30
Simple bash script for generating self-signed certificates with wildcard
#!/bin/bash
function usage {
echo "usage: $0 hostname"
exit 0
}
HOSTNAME=$1
[ -z ${HOSTNAME} ] && usage
# Object files
*.o
# Libraries
*.lib
*.a
# Shared objects (inc. Windows DLLs)
*.dll
*.so
@guimaluf
guimaluf / .zshrc
Last active November 20, 2019 21:21
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)
@guimaluf
guimaluf / .vimrc
Last active November 20, 2019 21:20
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'
[user]
name = Guilherme Maluf
email = guimalufb@gmail.com
[color]
diff = auto
status = auto
branch = auto
[core]
@guimaluf
guimaluf / .tmux.conf
Last active November 20, 2019 21:19
# 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
@guimaluf
guimaluf / config
Last active November 20, 2019 21:20
# 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
@guimaluf
guimaluf / rolldice.sh
Created October 15, 2018 17:35
Bash script to roll dices for D&D character sheet creation
#!/bin/bash
ATRIBUTOS=()
function remove_min {
local total=0
local dices=()
IFS=$'\n'
DICES=($(sort <<<"${ROLL[*]}"))