-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
53 lines (53 loc) · 1.64 KB
/
gitconfig
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
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
[alias]
co = checkout
# Log display from screencast, with train tracks.
l = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
lol = log --pretty=oneline --abbrev-commit --graph --decorate
# Other useful aliases
unstage = reset HEAD
staged = diff --cached
unstaged = diff
current-branch = !git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||'
# Usage: git track origin/feature-123-login-form
track = checkout -t
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
[apply]
whitespace = warn
[core]
excludesfile = /Users/hiphoox/Documents/Dotfiles/git/gitignore_global
editor = /usr/local/bin/vim
quotepath = false
[user]
name = Norberto Ortigoza
email = norberto.ortigoza@raku.mx
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[diff]
tool = Kaleidoscope
[color]
diff = auto
status = auto
branch = auto
ui = true
[help]
autocorrect = 1
[status]
submodule = 1
[push]
# Only push branches that have been set up to track a remote branch
default = current
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[mergetool]
keepBackup = true
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
[merge]
tool = Kaleidoscope