blob: 16a3504a75a2b473f5f93a76506bd7e6b0448139 (
plain)
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
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
|
[color]
diff = auto
status = auto
branch = auto
ui = auto
# To determine user and GPG key ID, we source this file:
[include]
path = ~/.gitconfig.local
# ...with the following content:
## vim:syntax=gitconfig
#[user]
# name = John McDoe III
# email = mail_redacted_for_web
# signingkey = 1FEDBEEFC0DEDBAD
[log]
date = iso
[alias]
st = status
lg = log -p
dc = diff --cached
lol = log --graph --decorate --pretty=format:'%C(auto)%h %G? %d %s%Creset' --abbrev-commit
lola = log --graph --decorate --pretty=format:'%C(auto)%h %G? %d %s%Creset' --abbrev-commit --all
logadog = log --all --decorate --oneline --graph
lf = log --graph --decorate --pretty=ln-long
ls = ls-files
compactlog = log --pretty=format:"%h%x09%an%x09%ad%x09%s" --date=short
# check out existing remote branch, e.g. origin/branchname
cb = checkout --track
co = checkout
cob = checkout -b
c = commit --verbose
ca = commit --verbose --all
s = status --short
l = log --color --graph --pretty=format:'%C(auto)%h %G? %d %s%Creset'
gi = init --bare
gs = init --bare --shared
aa = add --all --verbose
ap = add -p
up = pull --rebase=preserve
fa = fetch --all --verbose
fap = fetch --all --prune --verbose
gr = grep --break --heading --line-number
d = diff
ds = diff --stat
dc = diff --cached
la = "!git config -l|grep alias|cut -c 7-|sort|sed \"s/^\\([^=]\\+\\)=/\\1€/g\"|sed \"s|€/|@/|g;s|ts€|ts@|g;s|^la.*|la€<scrambled output, call git-alias>|g\"|column -ts€"
alias = "!git config -l|grep alias|cut -c 7-|sort"
cs = "!GPG_TTY=$(tty) git commit -S --verbose"
csa = "!GPG_TTY=$(tty) git commit -S --verbose --all"
csp = "!GPG_TTY=$(tty) git commit -S -pv"
tag = "!GPG_TTY=$(tty) git tag -s"
tty = "!export GPG_TTY=$(tty)"
puv = push --verbose
puff = "!git puv"
pl = pull -tpf
p = pull -tpf
branchpull = remote update origin --prune
branchremdel = push origin --delete
ba = branch --list --all
smam = submodule add -b master
smir = submodule update --init --recursive
smu = submodule foreach git pull
bl = branch --list
br = branch -r
rhh = reset --hard HEAD
sl = shortlog -s
sls = "!git shortlog -s | cut -f1 | spark"
gl-mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -"
cps = cherry-pick -S
[push]
default = simple
[pretty]
ln-long = format:%C(auto)%H %gD %d %nAuthor: %aN <%aE>%n%C(auto)GPG signature: %G? %GF (%GT)%nGPG Primary Key: %GP%nDate: %ad %nSubject: %s %+b %+N %+(trailers)
[core]
editor = vim
fileMode = true
hooksPath = ~/git-hooks
[merge]
tool = vimdiff
[mergetool]
keepBackup = false
[gui]
fontui = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0
fontdiff = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0
[commit]
gpgsign = false
#[gpg]
# program = /usr/bin/gpg2
[http]
#proxy = http://10.0.0.1:3128/
[pull]
rebase = false
[pack]
windowMemory = 1024m
[credential]
helper = !type pass-git-helper > /dev/null && pass-git-helper $@
useHttpPath = true
[init]
# we don't adhere to extremists trying to alter language, this was a bad idea pre-1990 and it still is.
# this term was not meant racially or sexually abusive, so the convention remains.
defaultBranch = master
|
