-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig.html
86 lines (84 loc) · 2.45 KB
/
gitconfig.html
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
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
<!DOCTYPE html>
<html>
<body>
<a href="https://github.com/paul2t/gitconfig">https://github.com/paul2t/gitconfig</a>
<h3><a href="https://github.com/paul2t/gitconfig/blob/master/.bashrc">.bashrc</a></h3>
<pre>
alias g='git'
complete -o bashdefault -o default -o nospace -F _git g 2>/dev/null || complete -o default -o nospace -F _git g
alias g2='git --git-dir=.git2'
complete -o bashdefault -o default -o nospace -F _git g2 2>/dev/null || complete -o default -o nospace -F _git g2
</pre>
<h3><a href="https://github.com/paul2t/gitconfig/blob/master/.gitconfig">.gitconfig</a></h3>
<pre>
[user]
name =
email =
[alias]
s = status -bs -uno
st = status -bs
ci = commit
co = checkout
br = branch
f = fetch --prune
fa = fetch --prune --all
l = log --color --graph --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit -20
la = log --color --graph --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit -20 --all
ls = log --color --graph --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit -5 --stat=211
ll = log -1
lls = log -1 --stat=211
llf = log -1 --pretty=fuller
logmove = log --follow
ls-ignored = !git ls-files -v | grep \"^[[:lower:]]\"
d = diff
dh = diff HEAD
ds = diff --stat=211
dst = diff --staged --stat=211
dsh = diff HEAD --stat=211
dt = diff --staged
dw = diff --color-words=.
dwt = diff --staged --color-words=.
dwh = diff HEAD --color-words=.
fmerge = merge --ff-only
mergeff = merge --ff-only
ffmerge = merge --ff-only
fpull = pull --ff-only
rb = rebase
reb = rebase --committer-date-is-author-date
rbc = rebase --continue
ss = show --stat=211
sw = show --color-words=.
chp = cherry-pick
chpc = cherry-pick --continue
ciane = commit --amend --no-edit
restart-merge = checkout -m
[core]
pager = less -FXRS -x4
fscache = true
[push]
default = upstream
[merge]
tool = p4merge
conflictstyle = diff3
[mergetool "meld"]
path = C:\\Program Files\\Meld\\meld\\meld.exe
[mergetool "p4merge"]
path = C:\\Program Files\\Perforce\\p4merge.exe
[mergetool "smerge"]
path = C:\\Program Files\\Sublime Merge\\smerge.exe
cmd = smerge mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
trustExitCode = true
[rerere]
enabled = true
[rebase]
autosquash = true
[gpg "x509"]
program = smimesign
[gpg]
format = x509
program = smimesign
[advice]
detachedHead = false
</pre>
</body>
</html>