-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathdot_gitconfig
35 lines (32 loc) · 1.11 KB
/
dot_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
[pull]
rebase = true
[rebase]
autostash = true
[user]
name = Mathieu Post
email = [email protected]
[user "https://lab.weave.nl"]
name = Mathieu Post
email = [email protected]
[user "ssh://[email protected]"]
name = Mathieu Post
email = [email protected]
[alias]
cm = !git add -A && git commit -m
wip = !git add -A && git commit -m "WIP"
save = commit -am "WIP"
undo = reset HEAD~1 --mixed
amend = commit -a --amend
wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
bclean = "!f() { git checkout ${1-master} && git branch --merged ${1-master} | grep -v " ${1-master}$" | xargs git branch -d; }; f"
ac = commit -am
fixup = "!f() { git commit --fixup ${1} && git rebase ${1}~1 -i --autosquash; }; f"
clean-custom = clean -xfd -e .idea
clean-custom-dry = clean -xfdn -e .idea
stash-staged = "!bash -c \"git stash --keep-index; git stash push -m \"staged\" --keep-index; git stash pop stash@{1}\""
[core]
autocrlf = input
excludesfile = ~/.gitignore
hookspath = ~/.gittemplates/hooks
[merge]
conflictStyle = diff3