dotfiles/.gitconfig at master · nl0/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
[color]
	ui = true

[user]
	email = nl.imbecile@gmail.com
	name = nl_0

[alias]
	a = add
	aa = add --all
	ap = add --patch # stage commits chunk by chunk

	b = branch -v # branch (verbose)

	c = commit -v
	cm = commit -m # commit with message
	ca = commit -av # commit all
	cam = commit -am # commit all with message
	amend = commit --amend # ammend your last commit
	ammend = commit --amend # ammend your last commit

	co = checkout
	nb = checkout -b # create and switch to a new branch (mnemonic: "git new branch branchname...")

	#cp = cherry-pick -x # grab a change from a branch

	d = diff # diff unstaged changes
	dc = diff --cached # diff staged changes
	last = diff HEAD^ # diff last committed change

	l = log --graph --date=short
	changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
	short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
	changelog = log --pretty=format:\" * %s\"
	shortnocolor = log --pretty=format:\"%h %cr %cn %s\"

	pl = pull
	ps = push

	rc = rebase --continue # continue rebase
	rs = rebase --skip # skip rebase

	r = remote -v # show remotes (verbose)

	unstage = reset HEAD # remove files from index (tracking)
	uncommit = reset --soft HEAD^ # go back before last commit, with files in uncommitted state
	filelog = log -u # show changes to a file
	mt = mergetool # fire up the merge tool

	ss = stash
	sl = stash list # list stashes
	sa = stash apply # apply stash (restore changes)
	sd = stash drop # drop stashes (destory changes)

	s = status # status

	t = tag -n # show tags with <n> lines of each tag message

	# svn helpers
	svnr = svn rebase
	svnd = svn dcommit
	svnl = svn log --oneline --show-commit

[merge]
	summary = true
	verbosity = 1

[apply]
#	whitespace = nowarn

[branch]
#	autosetupmerge = true

[push]
	# 'git push' will push the current branch to its tracking branch
	# the usual default is to push all branches
	default = tracking

[core]
	autocrlf = false
	editor = vim

[advice]
#	statusHints = false

[diff]
	# Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
	# instead of a/b/c/d as prefixes for patches
	mnemonicprefix = true