-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
67 lines (67 loc) · 2.34 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
[alias]
br = branch
ci = commit
squash = rebase HEAD~2 -i
cia = commit --all
cim = commit --amend
co = checkout
crp = cherry-pick
d = diff
dfl = diff --name-status
dfs = diff --staged
dl = diff HEAD^
f = fetch --tags
g = grep -in
last = log -1 HEAD
load = stash pop
logg = log --graph --decorate --oneline --abbrev-commit --all
logo = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
logs = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
mgf = merge --ff-only
mgo = merge -s ours
p = push
pf = push -f
puo = push -u origin
rb = rebase
rbc = rebase --continue
rh = reset --hard
rp = remote prune
save = stash
st = status
yes = log --oneline --since yesterday --pretty=format:'%Cred%h%Creset - %s' --abbrev-commit --date=relative
rename = "filter-branch --commit-filter 'if [ "$GIT_AUTHOR_NAME" = "johnson" ]; then export GIT_AUTHOR_NAME="johnson"; export GIT_AUTHOR_EMAIL=shijianyue@kezaihui.com; export GIT_COMMITTER_EMAIL=shijianyue@kezaihui.com; fi; git commit-tree "$@"'"
dm = "!git branch --merged | egrep -v '(^\\*|master|dev)' | xargs -n 1 git branch -d"
dre = "!f() { git branch | egrep \"^$1*\" | xargs -n 1 git branch -D; }; f"
[core] editor = vim
pager = less -F -X
excludesfile = /Users/yueyue/.gitignore_global
[color]
ui = true
[merge]
tool = Kaleidoscope
[push]
default = simple
[credential]
helper = cache --timeout 36000
[user]
name = johnson
email = shijianyue47@gmail.com
[difftool "sourcetree"]
cmd = /usr/local/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[commit]
template = /Users/yueyue/.stCommitMsg
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[mergetool]
prompt = false
[diff]
tool = Kaleidoscope