-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
67 lines (67 loc) · 2.94 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
[core]
excludesfile = C:\\Users\\schmidj\\Documents\\gitignore_global.txt
editor = notepad
autocrlf = true
[user]
name = Jonathan Schmidt
[push]
default = simple
[branch]
autosetuprebase = always
[color]
ui = true
status = auto
branch = auto
[diff]
tool = bc4
guitool = beyondcompare3
[difftool "bc3"]
path = c:/program files (x86)/beyond compare 4/bcomp.exe
[merge]
tool = bc4
[mergetool "bc3"]
path = c:/program files (x86)/beyond compare 4/bcomp.exe
[alias]
diffall = difftool -d origin/master
diffserver = difftool -d HEAD^ origin/master
lg = log -i --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
pr = "!f() { git fetch origin refs/pull/$1/head:pr/$1; } ; f"
prc = "!f() { git fetch origin refs/pull/$1/head:pr/$1; git checkout pr/$1; } ; f"
rename = "!f() { git push origin origin/$1:refs/heads/$2 :$1; } ; f"
diffprev = "!f() { git difftool -d $1^ $1; } ; f"
diffbase = "!f() { git difftool -d $(git merge-base origin/develop origin/$1)..origin/$1; }; f"
diffbase2 = "!f() { git difftool -d $(git merge-base $1 $2)..$2; }; f"
diffbasesha = "!f() { git difftool -d $(git merge-base origin/develop $1)..$1; }; f"
my-commits-last-month = !git log --author=\"`git config user.name`\" --before={`date "+%Y-%m-01"`} --after={`date -v-1m "+%Y-%m-01"`} --reverse --pretty=format:\"%cd %h %s\" --date=short
db = "!f() { git difftool -d $(git merge-base origin/develop origin/$1)..origin/$1; }; f"
dbr = "!f() { git difftool -d $(git merge-base origin/release/1.8.0 origin/$1)..origin/$1; }; f"
list-commited-ignored-files = "!f() { git ls-files | git check-ignore --no-index --stdin -v | grep -v !; }; f"
fpush = push --force origin
tb = for-each-ref --format='%(refname:short) %(push:track)' refs/heads
merge-release-notes = "!f() { git log --oneline --grep=\"Merge pull request\" origin/develop..origin/release/2.0.0 --pretty=short | git shortlog -e; }; f"
pullall = "!f(){ git fetch -p --recurse-submodules=yes && git pull \"$@\" && git submodule update --init --recursive; }; f"
[difftool "sourcetree"]
cmd = 'C:/Program Files (x86)/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = 'C:/Program Files (x86)/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[pull]
rebase = true
[difftool "beyondcompare3"]
path = C:/Program Files (x86)/Beyond Compare 4/bcomp.exe
cmd = \"C:/Program Files (x86)/Beyond Compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[mergetool]
keepBackup = false
[mergetool "bc4"]
trustExitCode = true
cmd = 'C:/Program Files (x86)/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
[difftool "bc4"]
cmd = 'C:/Program Files (x86)/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\"
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[log]
date = relative