-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
37 lines (37 loc) · 694 Bytes
/
gitconfig
File metadata and controls
37 lines (37 loc) · 694 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
[user]
name = Ruy Diaz
email = diazruy@gmail.com
[github]
user = diazruy
[color]
ui = true
diff = auto
status = auto
branch = auto
[branch]
autosetuprebase = always
[alias]
st = status --short
com = commit
br = branch
co = checkout
ci = commit
l = log --oneline --graph --decorate
staged = diff --staged
unstaged = diff
unstage = reset HEAD
[merge]
keepBackup = false
tool = p4merge
prompt = false
[mergetool "p4merge"]
cmd = /home/ruy/p4v/bin/p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
keepTemporaries = false
trustExitCode = false
keepBackup = false
[web]
browser = google-chrome
[cola]
spellcheck = false
[mergetool]
keepBackup = false