-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
67 lines (64 loc) · 1.84 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
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
[user]
name =
email =
[core]
excludesfile = ~/.gitignore_global
editor = vim
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = true
pager = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[diff]
tool = vimdiff
[difftool]
prompt = false
[alias]
d = difftool
oneline = log --pretty="oneline"
new = !sh -c 'git log $1@{1}..$1@{0} "$@"'
st = status
ci = commit
b = branch
br = branch -va
co = checkout
df = diff
who = shortlog -s --
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
## Usage: `git invoice` to list recent commits in "pretty format"
invoice = log --pretty=format:'%ad - %s' --abbrev-commit --date=short
# See http://www.lorrin.org/blog/2011/10/03/argumentless-git-pull-and-git-push/
# Use `origin` as the default remote on the `master` branch in all cases
[branch "master"]
remote = origin
merge = refs/heads/master
[merge]
# See http://nvie.com/posts/a-successful-git-branching-model/
# The --no-ff flag causes the merge to always create a new commit object, even if the
# merge could be performed with a fast-forward. This avoids losing information about
# the historical existence of a feature branch and groups together all commits
# that together added the feature.
ff = false
[branch]
autosetuprebase = always
[fetch]
# Prune always to remove remote branches
# http://stackoverflow.com/questions/18308535/automatic-prune-with-git-fetch-or-pull
prune = true
[remote "origin"]
prune = true