-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
41 lines (39 loc) · 1.4 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
[user]
name = Holger Grosse-Plankermann
email = [email protected]
[includeif "gitdir:/Users/holgergp/development/projects/"]
path = ~/.dotfiles/.gitconfig-work
[core]
excludesfile = /Users/holgergp/.gitignore_global
autocrlf = input
editor = /usr/bin/vim
pager = diff-so-fancy | less --tabs=4 -RFX
[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
[alias]
# assumes git.git clone at ~/src/git
# short for checkour
co = checkout
diff-highlight = "!f() { git diff \"$@\" | ~/scripts/git/contrib/diff-highlight/diff-highlight; }; f"
# new branch
cob = checkout -b
# add and commit
cm = !git add -A && git commit -m
#loga = log --format=\"%C(yellow)%h %C(red)%cd %C(green)%<(18,trunc)%cn %C(reset)%s\" --date=\"format:%d %b %H:%M:%S\"
loga = log --first-parent -20 --format=\"%C(yellow)%h %C(red)%cd %C(green)%<(18,trunc)%cn %C(reset)%s\" --date=\"format:%d %b %H:%M:%S\"
dsf = "!f() { [ -z \"$GIT_PREFIX\" ] || cd \"$GIT_PREFIX\" && git diff --color \"$@\" | diff-so-fancy | less --tabs=4 -RFX; }; f"
[color "status"]
changed = magenta white bold
[color "diff"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[credential]
helper = osxkeychain
[pull]
rebase = false