-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
44 lines (42 loc) · 1018 Bytes
/
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
; Add this to my global gitconfig
; [user]
; name = <name>
; email = <email>
; [include]
; path = ~/.dotfiles/gitconfig
[alias]
l = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
a = add
p = add -p
s = status
st = stash
c = checkout
d = diff
idiff = diff --word-diff=plain
append = commit --amend --no-edit
stash-untracked = "!f() { \
git stash; \
git stash -u; \
git stash pop stash@{1}; \
}; f"
history-of = log --follow -p --stat --
[mergetool "kdiff3"]
path = /usr/local/bin/kdiff3
[merge]
ff = only
tool = vimdiff
conflictstyle = diff3
prompt = false
[pull]
ff = only
[push]
default = current
[core]
pager = diff-so-fancy | less --tabs=4 -RFX
[interactive]
diffFilter = diff-so-fancy --patch
[help]
autocorrect = 1
[credential]
helper = gnome-keyring
; vi:syntax=gitconfig