-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
56 lines (50 loc) · 1.89 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
# This is Git's per-user configuration file.
[user]
name = Thomas
email = [email protected]
signingkey = BB71073A25B9B76C
[core]
editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -nosession
[mergetool "intellij"]
cmd = 'C:/Users/s156757/AppData/Local/JetBrains/Toolbox/apps/IDEA-U/ch-0/182.4505.22/bin/idea.bat' merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[merge]
tool = intellij
[mergetool]
keepBackup = false
[rerere]
enabled = true
[alias]
br = checkout -b
st = status -sb
ci = commit -am
co = checkout
fancylog = log --graph --decorate --oneline --all
# Commit and push. Parameter: commit message
cp = "!f() { git add -A && git commit -m \"$@\" && git push; }; f"
# The ! is to make the | work
# To use, configure git config sendemail.to [email protected]
sendcommit = ! git format-patch -M HEAD^ | xargs git send-email && rm *.patch
# Delete all local branches which are merged
# Use ! to use |, escape \ and use ' instead of "
delete-merged-branches = ! git branch --merged | egrep -v '(^\\*|master)' | xargs git branch -d
# Check which remote branches would be deleted. Parameter: remote name (e.g. origin)
delete-merged-remote-branches-dry-run = ! git branch -r --merged | grep -v master | grep \"$@\" | sed 's/'$@'\\///' | xargs -n 1 echo
# Delete all remote branches which are merged. Parameter: remote name (e.g. origin)
delete-merged-remote-branches = ! git branch -r --merged | grep -v master | grep \"$@\" | sed 's/'$@'\\///' | xargs -n 1 git push --delete
[merge "theirs"]
driver = true
[commit]
gpgsign = true
[pull]
rebase = true
[sendemail]
smtpencryption = tls
smtpserver = smtp.gmail.com
smtpuser = [email protected]
smtppass = todo
smtpserverport = 587
suppresscc = self # Do send email also to author
confirm = auto # Automatically confirm before sending mail
[winUpdater]
recentlySeenVersion = 2.19.0.windows.1