-
Notifications
You must be signed in to change notification settings - Fork 0
/
_gitconfig
53 lines (53 loc) · 1.17 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
[user]
name = Darrel Portzline
email = [email protected]
[color]
ui = auto
[color "branch"]
current = green
local = yellow
remote = magenta
[color "diff"]
meta = yellow
frag = magenta
old = red
new = green
[color "status"]
added = yellow
changed = green
untracked = cyan
[alias]
co = checkout
ci = commit
st = status -sb
rb = !git fetch origin && git rebase origin/master
lga = log --pretty=format:'%an %Cred%d%Creset(%Cred%h%Creset) - %s %C(yellow)%ar' --graph -n 100
unmerged = diff --name-status --diff-filter=U
aa = add -A
del = "!git clean -f; git reset HEAD --hard"
pr = "!f() { git fetch origin refs/pull/$1/head:pr$1; } ; f"
f = fetch --all -p
amend = commit --amend -C HEAD
[diff]
tool = p4merge
guitool = p4merge
renames = copies
[difftool]
prompt = false
[difftool "p4merge"]
cmd = p4merge \"$LOCAL\" \"$REMOTE\"
[merge]
tool = p4merge
[mergetool]
prompt = false
keepTemporaries = false
keepBackup = false
[mergetool "p4merge"]
cmd = p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = true
keepbackup = false
[push]
default = simple
[core]
editor = vim
excludesfile = ~/.gitignore_global