-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig
52 lines (51 loc) · 1.99 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
[user]
name = Hal Wine
email = [email protected]
signingkey = 5B58CECCB33FADF432D95BD1F6D0F761DCCCECA4
[core]
excludesfile = ~/.gitignore_global
whitespace = trailing-space,space-before-tab,tab-in-indent
editor = vim
[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]
[gui]
recentrepo = /Users/hwine/tmp/trac-git/sys_trac_hg/trac_hacks/gitplugin
[color]
branch = auto
diff = auto
grep = auto
interactive = auto
status = auto
ui = auto
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
#[mergetool "sourcetree"]
#cmd = /Volumes/SourceTree/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
#trustExitCode = true
[alias]
graph = log --graph --date-order -C -M --pretty=format:\"<%h> %ad [%an] %Cgreen%d%Creset %s\" --all --date=short
glog = graph
lol = log --graph --decorate --pretty=oneline --abbrev-commit
ls = "!f () { set | grep GIT;} ; f"
s = status --short --branch --untracked-files=no
attic = log --diff-filter=D --summary
# aliases from
# http://stackoverflow.com/questions/1527234/finding-a-branch-point-with-git
oldest-ancestor = !bash -c 'diff --old-line-format= --new-line-format= <(git rev-list --first-parent \"${1:-master}\") <(git rev-list --first-parent \"${2:-HEAD}\") | head -1' -
branchdiff = !sh -c \"git diff `git oldest-ancestor`..\"
branchlog = !sh -c \"git log `git oldest-ancestor`..\"
[push]
default = current
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[credential]
# helper = osxkeychain