-
Notifications
You must be signed in to change notification settings - Fork 2
/
.gitconfig
75 lines (74 loc) · 2.51 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
68
69
70
71
72
73
74
75
[user]
name = Ryan
email = [email protected]
[color]
interactive = auto
status = auto
branch = auto
diff = auto
ui = auto
[core]
editor = /usr/bin/vim
excludesfile = ~/.gitignore_global
pager = diff-so-fancy | less --tabs=4 -RFX
ignorecase = false
[alias]
st = status
ci = commit
co = checkout
br = branch
tags = tag -l
branches = branch -a
remotes = remote -v
rbr = remote update origin --prune
#Latest commit w/ contet
last = log -1 -U
# Flattern log w/ short-hash/subject/
ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%C(cyan)\\ [%cn]" --decorate
# ls + file number stats
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%C(bold)%s%C(cyan)\\ [%cn]%Creset" --decorate --numstat
# Tree log with files
files = log --oneline --decorate --all --graph --stat
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
tree = log --graph --full-history --all --color --date=short --pretty=format:'%Cred%x09%h %Creset%ad%Cblue%d %Creset %s %C(bold)(%an)%Creset'
grog = log --graph --abbrev-commit --decorate --all --format=format:\"%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(dim white) - %an%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset)\"
# Log single file history w/o content
logf = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%C(cyan)\\ [%cn]%Creset" --follow -- #<FILE>
# Log single file history w content
showf = log --follow -p -- #<FILE>
# Show commit files
showc = diff-tree --no-commit-id --name-only -r
please = push --force-with-lease
commend = commit --amend --no-edit
stsh = stash --keep-index
staash = stash --include-untracked
staaash = stash --all
shorty = status --short --branch
merc = merge --no-ff
[push]
default = matching
followTags = true
[difftool "diffmerge"]
cmd = /usr/local/bin/diffmerge --nosplash \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "diffmerge"]
cmd = /usr/local/bin/diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
trustExitCode = true
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[merge]
tool = diffmerge
conflictstyle = diff3
[mergetool]
prompt = false
[init]
defaultBranch = main