-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
120 lines (115 loc) · 3.9 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
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
[user]
name = Tolga Ekmen
email = [email protected]
[alias]
lf = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all --full-history
# View the SHA, description, and history graph of the latest 20 commits
l = log --pretty=oneline -n 20 --graph
# View the current working tree status using the short format
s = status -s
# Diff
d = diff --patch-with-stat
# Pull in remote changes for the current repository and all its submodules
p = !"git pull; git submodule foreach git pull origin master"
# Clone a repository including all submodules
c = clone --recursive
# Commit all changes
ca = !git add -A && git commit -av
# Switch to a branch, creating it if necessary
go = checkout -B
# Show verbose output about tags, branches or remotes
tags = tag -l
branches = branch -a
remotes = remote -v
# Credit an author on the latest commit
credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
# Undo a `git push`
undopush = push -f origin HEAD^:master
# status shortcut
st = status
[apply]
# Detect whitespace errors when applying a patch
#whitespace = fix
[core]
# Use custom `.gitignore` and `.gitattributes`
excludesfile = /Users/tekm/.gitignore_global
attributesfile = ~/.gitattributes
# Treat spaces before tabs, lines that are indented with 8 or more spaces, and all kinds of trailing whitespace as an error
#whitespace = space-before-tab,indent-with-non-tab,trailing-space
editor = /usr/bin/vim
[color]
# Use colors in Git commands that are capable of colored output when outputting to the terminal
ui = auto
diff = auto
[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
[merge]
# Include summaries of merged commits in newly created merge commit messages
log = true
defaultToUpstream = true
tool = diffmerge
# Use `origin` as the default remote on the `master` branch in all cases
[branch "master"]
remote = origin
merge = refs/heads/master
# URL shorthands
[url "[email protected]:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
insteadOf = "github:"
[url "[email protected]:"]
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"]
insteadOf = "gist:"
#BACKUP
# l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s #%Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --branches --tags --#remotes -n15
# lf = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s #%Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all --full-history -n15
# ff = merge --ff-only
# reflogtree = "!git lf `git reflog | cut -c1-7`"
#
#
#[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
[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
[giggle]
main-window-maximized = true
main-window-geometry = 980x706+1985+24
main-window-view = FileView
history-view-vpane-position = 781
file-view-vpane-position = 531
[push]
default = simple
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
[difftool "diffmerge"]
cmd = /usr/local/bin/diffmerge \"$LOCAL\" \"$REMOTE\"
[diff]
tool = diffmerge
[http]
sslCAInfo = /Users/tekm/certs/merged.pem