forked from petrknap/home
-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
52 lines (50 loc) · 1.61 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
42
43
44
45
46
47
48
49
50
51
52
[user]
email = david.dutkovsky@gmail.com
name = David Dutkovsky
[alias]
lona = --pretty=format:"%h %s [%an]" --graph --date=short
aliases = !git config --list | grep ^alias\\. | cut -c 7- | grep -Ei --color \"$1\" "#"
p = push
fp = push -f # use carefully!
co = checkout
c = commit
st = status
br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
type = cat-file -t
dump = cat-file -p
lo = log --oneline
lon = "log --oneline -n"
df = diff
dfc = diff --cached
s = show
open = reset --soft HEAD~1
ffs = flow feature start
fff = flow feature finish
fi = flow init
# from ondra kopal
sp = "stash show stash@{0} -p"
ss = "!f(){ git stash show -p stash@{${1}}; };f"
sl = stash list
ls = log --pretty=format:'%C(green)%h%Creset - %s%C(yellow)%d%Creset%n %aD (%ar %C(red)- %an%Creset)' --graph --color
ll = log --pretty=format:'%C(green)%h%Creset - %s%C(yellow)%d%Creset%n %aD (%ar %C(red)- %an%Creset)' --graph --color --all
wc = whatchanged -p --pretty=format:'%C(red)%h %Creset%s%n%C(yellow)%an <%ae> %C(green)(%ar)%Creset'
bl = blame
uiu = update-index --assume-unchanged # untrack file
uit = update-index --no-assume-unchanged # track file
ctags = "!f(){ ./.git/hooks/ctags; };f"
unstash = stash pop
[push]
default = current
[core]
eol = lf
autocrlf = input
[merge]
ff = only
[difftool "sourcetree"]
cmd = 'C:/david/programs/KDiff3/kdiff3.exe' \"$LOCAL\" \"$REMOTE\"
[grep]
lineNumber = true
[commit]
global = C:/Users/xantin/git/commit-template.txt
template = C:/Users/xantin/git/commit-template.txt