Skip to content

Instantly share code, notes, and snippets.

@carlosanders
Last active March 21, 2021 19:36
Show Gist options
  • Save carlosanders/80a46f1833432aae9678980c25db95a6 to your computer and use it in GitHub Desktop.
Save carlosanders/80a46f1833432aae9678980c25db95a6 to your computer and use it in GitHub Desktop.
#https://gist.github.com/pksunkara/988716
[user]
name = Anders
email = [email protected]
[core]
#editor = subl.exe
editor = 'C:/Microsoft VS Code/Code.exe' -w
[http]
sslverify = false
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[merge]
tool = winmerge
[mergetool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = "/c/Program\\ Files/WinMerge/WinMergeU.exe" -u -e -fm -wl -dl "Local" -wr -dr "Remote" $LOCAL $MERGED $REMOTE
[diff]
tool = winmerge
[difftool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = "/c/Program\\ Files/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTE
[color]
ui = auto
[color "branch"]
current = yellow bold
local = green bold
remote = cyan bold
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = green bold
changed = yellow bold
untracked = red bold
[alias]
a = add --all
ai = add -i
#############
ap = apply
as = apply --stat
ac = apply --check
#############
ama = am --abort
amr = am --resolved
ams = am --skip
#############
b = branch
ba = branch -a
bd = branch -d
br = branch -r
bdd = branch -D
#############
c = commit
ca = commit -a
cm = commit -m
cem = commit --allow-empty -m
cam = commit -am
cd = commit --amend
cad = commit -a --amend
ced = commit --allow-empty --amend
#############
cp = cherry-pick
cpa = cherry-pick --abort
cpc = cherry-pick --continue
#############
d = diff
dc = diff --cached
dl = difftool
dlc = difftool --cached
dk = diff --check
dp = diff --patience
dck = diff --cached --check
#############
f = fetch
fo = fetch origin
fu = fetch upstream
#############
fp = format-patch
#############
fk = fsck
#############
g = grep -p
#############
l = log --oneline
lg = log --oneline --graph --decorate
lgs = log --stat ##resumo dos arquivos alterados número de linhas adicionadas
##exibir o histórico resumido do nosso repositório com o commit para o qual a master está apontado e
#os commits pai de cada commit
lgp = log --oneline --decorate --parents
#############
ls = ls-files
lsf = "!git ls-files | grep -i"
#############
m = merge
ma = merge --abort
mc = merge --continue
ms = merge --skip
#############
o = checkout
ob = checkout -b
#############
pr = prune -v
#############
ps = push
psf = push -f
psu = push -u
pso = push origin
psao = push --all origin
psfo = push -f origin
psuo = push -u origin
psom = push origin master
psfom = push -f origin master
psuom = push -u origin master
#############
pl = pull
plu = pull -u
plo = pull origin
plp = pull upstream
plom = pull origin master
plpm = pull upstream master
#############
pb = pull --rebase
pbo = pull --rebase origin
pbp = pull --rebase upstream
pbom = pull --rebase origin master
pbpm = pull --rebase upstream master
#############
rb = rebase
rba = rebase --abort
rbc = rebase --continue
rbi = rebase --interactive
rbs = rebase --skip
#############
re = reset
rh = reset HEAD
reh = reset --hard
rem = reset --mixed
res = reset --soft
rehh = reset --hard HEAD
remh = reset --mixed HEAD
resh = reset --soft HEAD
r = remote
ra = remote add
rr = remote rm
rv = remote -v
rm = remote rename
rp = remote prune
rs = remote show
rao = remote add origin
rau = remote add upstream
rso = remote show origin
rsu = remote show upstream
rpo = remote prune origin
rpu = remote prune upstream
#############
s = status
sb = status -s -b
#############
sa = stash apply
sc = stash clear
sd = stash drop
sl = stash list
sp = stash pop
ss = stash save
sw = stash show
#############
w = show
wp = show -p
wr = show -p --no-color
#############
svnr = svn rebase
svnd = svn dcommit
svnl = svn log --oneline --show-commit
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment