Skip to content

Instantly share code, notes, and snippets.

@adrianoxavier
Last active October 30, 2018 19:59
Show Gist options
  • Save adrianoxavier/e6466d1afd289bc8f8cd to your computer and use it in GitHub Desktop.
Save adrianoxavier/e6466d1afd289bc8f8cd to your computer and use it in GitHub Desktop.
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
[user]
name = Adriano Xavier
email = px.adriano@gmail.com
[filter "lfs"]
clean = git lfs clean %f
smudge = git lfs smudge %f
required = true
[alias]
a = add .
s = status
pl = pull origin develop
ps = push origin develop
c = commit -m
c1 = commit -m "- correções"
mt = mergetool
dt = difftool
[merge]
tool = p4merge
[mergetool "p4merge"]
cmd = p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
path = C:/Program Files/Perforce/p4merge.exe
[diff]
tool = p4merge
[difftool "p4merge"]
cmd = p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment