Skip to content
Newer
Older
100644 30 lines (29 sloc) 752 Bytes
587dd21 @mislav dotfilez\!
authored
1 [user]
2037acd @mislav update gitconfig
authored
2 name = Mislav Marohnić
587dd21 @mislav dotfilez\!
authored
3 email = mislav.marohnic@gmail.com
4 [apply]
5 whitespace = nowarn
6 [alias]
8a404e4 @mislav add some git aliases: `up` (rebase and push), `ignored`, `nb` (new br…
authored
7 nb = checkout -b
b39428b @mislav properly indent lines in .gitconfig and add `subadd` command for subm…
authored
8 lc = log ORIG_HEAD.. --stat --no-merges
9 conflicts = !git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR
10 resolve = !git ls-files --unmerged | cut -c51- | sort -u | xargs git add
9147257 @mislav fix `git lg`
authored
11 lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar)%Creset' --abbrev-commit --date=relative
2037acd @mislav update gitconfig
authored
12 ff = merge --ff-only @{u}
587dd21 @mislav dotfilez\!
authored
13 [color]
14 diff = auto
15 status = auto
16 branch = auto
17 [core]
df239ef @mislav updates for OS X
authored
18 excludesfile = /Users/mislav/.gitignore
2037acd @mislav update gitconfig
authored
19 quotepath = false
20 whitespace = -blank-at-eol
587dd21 @mislav dotfilez\!
authored
21 [mirror]
22 summary = true
8a404e4 @mislav add some git aliases: `up` (rebase and push), `ignored`, `nb` (new br…
authored
23 [branch]
24 autosetupmerge = true
9298022 @mislav git auto setup rebase = always
authored
25 autosetuprebase = always
fcf72dd @mislav new helpful git commands
authored
26 [push]
27 default = tracking
94262b7 @mislav `git config --global rebase.autosquash true`
authored
28 [rebase]
29 autosquash = true
Something went wrong with that request. Please try again.