forked from mislav/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
43 lines (43 loc) · 1.26 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
[user]
name = sri raghavan
email = sri.raghavan.1@gmail.com
[apply]
whitespace = nowarn
[alias]
co = checkout
put = push origin HEAD
up = !git pull --rebase && git push
ignored = "!git ls-files --others --exclude-standard"
nb = checkout -b
pending = !git --no-pager log origin/master..master && echo
db = !sh -c 'git branch -D "$0" && git push origin ":$0"' &> /dev/null
missing = !sh -c 'git cherry "$0" | cut -sd + -f 2 | xargs "git show"'
lc = log ORIG_HEAD.. --stat --no-merges
conflicts = !git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR
resolve = !git ls-files --unmerged | cut -c51- | sort -u | xargs git add
unstage = reset HEAD
subadd = !sh -c 'git submodule add $(git config -f"$0".git/config remote.origin.url) "$0"'
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
ff = merge --ff-only @{u}
[format]
# pretty = format:"%Cblue%ar%Creset\t%s"
[color]
diff = auto
status = auto
branch = auto
[core]
excludesfile = /Users/srir/.gitignore
quotepath = false
whitespace = -blank-at-eol
editor = /usr/bin/vim
[mirror]
summary = true
[branch]
autosetupmerge = true
autosetuprebase = always
[push]
default = tracking
[rebase]
autosquash = true
[rerere]
enabled = true