-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
66 lines (60 loc) · 1.67 KB
/
.gitconfig
File metadata and controls
66 lines (60 loc) · 1.67 KB
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
54
55
56
57
58
59
60
61
62
63
64
65
66
[user]
name = vincent.greff
[color]
ui = auto
diff = auto
status = auto
branch = auto
interactive = auto
[core]
whitespace = trailing-space,space-before-tab
[diff]
renames = copies
[merge]
stat = true
[alias]
br = branch
ci = commit
last = log -1 HEAD
st = status
co = checkout
staged = "diff --cached"
unstaged = diff
both = "diff HEAD"
oneline = "log --pretty=oneline"
lg = "log --graph --all --pretty=format:'%Cred%h%Creset - %Cgreen(%cr)%Creset %s%C(yellow)%d%Creset' --abbrev-commit --date=relative"
lg2 = "log --oneline --date-order --graph --all --decorate"
lg3 = "log --pretty=format:'%Cred%h%Creset%x09%Cblue%ad%Creset%x09%Cgreen(%an)%Creset %x09%s' --date=relative --topo-order --graph"
lg4 = "log --pretty=format:'%Cred%h%Creset%x09%Cblue%ad%Creset%x09%Cgreen(%an)%Creset %x09%s' --date=relative --topo-order --graph --stat"
F = pull
P = push
aa = "add -A"
ai = add --interactive
cm = commit -m
cma = commit -a -m
ca = commit --amend
caa = commit -a --amend -C HEAD
amend = "commit --ammend"
plus = "commit --ammend"
r = reset
r1 = reset HEAD^
r2 = reset HEAD^^
rh = reset --hard
rh1 = reset HEAD^ --hard
rh2 = reset HEAD^^ --hard
meld = !~/bin/git-meld.pl
cat = cat-file
[giggle]
main-window-maximized = false
main-window-geometry = 1497x1123+3991+25
main-window-view = FileView
show-graph = true
history-view-vpane-position = 363
file-view-vpane-position = 621
[rerere]
enabled = true
#[pull]
# rebase = true
#[branch "master"]
# mergeoptions = --squash