-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
79 lines (65 loc) · 2.93 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
76
77
78
79
[user]
name = Thasso Griebel
email = [email protected]
signingkey = /Users/thasso/.ssh/id_ed25519_sk_590.pub
[alias]
dt = difftool
;release = !sh -c \"git checkout production && git pull --rebase origin production && git flow release start $1 && git flow release finish $1\"
subup = submodule update --init --recursive
tags = !sh -c \"git for-each-ref --format='%(color:green)%(refname:short)|%(color:white)[%(taggerdate:relative)]|%(color:blue)%(objectname:short)|%(color:yellow)%(contents:subject)|%(color:white)Tagged by %(taggername)' --sort='-taggerdate' --count=10 refs/tags | awk -F'|' '{printf \\\"%-12s %-20s %s %-35s %s\\n\\\", \\$1, \\$2, \\$3, \\$5, \\$4}'\"
branches = "branch -a"
remotes = "remote -v"
# Shorten common commands
co = "checkout"
st = "status"
br = "branch"
ci = "commit"
d = "diff"
# Log that shows titles of last 16 commits
l = "log -16 --color=always --all --topo-order --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"
# Log that starts a pager with titles of all the commits in your tree
ll = log --color=always --all --topo-order --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
# Log that shows the last 10 commits as a graph
lg = "log -10 --color=always --all --graph --topo-order --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"
# Log that shows all commits as a graph (using a pager)
lgl = "log --color=always --all --graph --topo-order --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
# Show outgoing commits
out = "log @{u}.."
# Print the title of the current branch; sometimes useful for scripting
currentbranch = "!git branch --contains HEAD | grep '*' | tr -s ' ' | cut -d ' ' -f2"
# Better diffs for prose
wdiff = "diff --color-words"
# Safer pulls; don't do anything other than a fast forward on merge
pull = "pull --ff-only"
# Amend last commit without modifying commit message
amend = "!git log -n 1 --pretty=tformat:%s%n%n%b | git commit -F - --amend"
# Create a commit that will be automatically squashed as a fixup when you
# run `git rebase --autosquash`
fixup = "commit --fixup=HEAD"
[color]
ui = auto
[push]
default = simple
[branch]
autosetuprebase = always
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[diff]
tool = vimdiff
[difftool]
prompt = false
[core]
autocrlf = input
excludesfile = /Users/thasso/.gitignore_global
[init]
defaultBranch = main
[gpg]
format = ssh
[commit]
gpgsign = true
[tag]
gpgsign = true