dotfiles/gitconfig at master · jpdombrowski/dotfiles · GitHub

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
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
[user]
	name = Jan-Philipp Dombrowski
	email = jpdombrowski@gmail.com
; [url "https://gitlab.louis-net.de/"]
;   insteadOf = git@gitlab.louis-net.de:
[url "https://github.com/"]
	insteadOf = gh:
[url "https://jpdombrowski@bitbucket.org/"]
	insteadOf = bb:
[color]
	diff = auto
	status = auto
	branch = auto
	interactive = auto
	ui = true
[alias]
	fetch = fetch --tags # always grab all tags
	f = fetch
	ft = fetch --tags
	a = add .
	ac = commit -a
	ask = add --patch
	shell = add --interactive
	sh = add --interactive
	#lol = log --graph --decorate --pretty=oneline --abbrev-commit
	#lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
	s = status -s -b
	st = status -s -b
	c = checkout
	cb = checkout -b
	co = checkout
	ct = checkout -t
	cm = checkout master
  cool = checkout online
	cd = checkout develop
	cl = clone
	ci = commit
	cs = commit --signoff
	csh = commit --interactive
	ca = commit -a
	cash = commit --amend --interactive
	cia = commit --amend
	sign = commit --amend --signoff
	so = commit --amend --signoff
	fix = commit --amend -C HEAD # git fix some/file
	p = push origin HEAD
	pa = push
	po = push origin
	pom = push origin master
	pr = pull --rebase
	pop = stash pop
	l = log --graph --pretty=format:'%C(yellow)%h%Cred%d%Creset %s %Cgreen(%cr %an)%Creset' --abbrev-commit --date=relative --date-order
	la = log --graph --all --pretty=format:'%C(yellow)%h%Cred%d%Creset %s %Cgreen(%cr %an)%Creset' --abbrev-commit --date=relative --date-order
	#lg = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr %an)%Creset' --abbrev-commit --date=relative
	ll = log --graph --decorate --stat --date-order
	lla = log --graph --decorate --stat --all --date-order
	lc = log -n1 --oneline
	lso = ls-files -o
	lost = !"git fsck --lost-found | awk '/dangling commit/ {print $3}' | git show --format='SHA1: %C(yellow)%h%Creset %f' --stdin | awk '/SHA1/ {sub(\"SHA1: \", \"\"); print}'"
	d = diff
	ds = diff --staged
	dc = diff --cached
	dh = diff HEAD
	dl = diff HEAD~1
	dm = diff master..HEAD
	do = diff ORIG_HEAD...HEAD
	ignore = update-index --assume-unchanged
	unignore = update-index --no-assume-unchanged
	i = update-index --assume-unchanged
	ui = update-index --no-assume-unchanged
	m = merge
	md = merge develop
	mm = merge master
	noff = merge --no-ff
	nff = merge --no-ff --no-edit
	ff = merge --ff-only
	ffm = merge --ff-only master
	nffm = merge --no-ff --no-edit master
	ffd = merge --ff-only develop
	nffd = merge --no-ff --no-edit develop
	abort = merge --abort
	b = branch
	br = branch -r
	bm = branch -a --merged
	bu = branch -a --no-merged
	bnm = branch -a --no-merged
	subup = submodule update --init --recursive
	su = submodule update --init --recursive
	rh = reset HEAD
	fuck = reset --soft HEAD~1
	uncommit = reset --soft HEAD~1
	undo = reset --hard HEAD~1
	unmerge = reset --merge ORIG_HEAD
	nw = new-workdir
	rev = rev-parse --short
	head = rev-parse --short HEAD
	r = revert
	rnc = revert --no-commit
	squash = rebase -i
	cp = cherry-pick
	g = grep
	rc = rebase --continue
	ra = rebase --abort
	rs = rebase --skip
	ctags = !.git/hooks/ctags
	permission-reset = !git diff -p -R | grep -E \"^(diff|(old|new) mode)\" | git apply
[git-up "bundler"]
	check = false
	autoinstall = false
[git-up "rebase"]
	arguments = --preserve-merges
[core]
	excludesfile = ~/.gitignore
	editor = vim
[merge]
	renamelimit = 5000
[branch]
	autosetuprebase = remote
[push]
	default = matching
[credential]
	helper = osxkeychain
[init]
	templatedir = ~/.git_template