-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
33 lines (33 loc) · 1.18 KB
/
.gitconfig
File metadata and controls
33 lines (33 loc) · 1.18 KB
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
[core]
eol = =
editor = winpty vim
autocrlf = true
[alias]
rebasemaster = !git checkout master && git pull && git checkout - && git rebase - --autostash
logp = log --pretty=oneline
last = log -1 HEAD --name-only
mwps = push -o merge_request.create -o merge_request.target=master -o merge_request.merge_when_pipeline_succeeds
pushrequest = push -o merge_request.create -o merge_request.target=master
pushbranch = !git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)
pushb = pushbranch
pushf = push --force-with-lease
pr = !git push && hub pull-request -po
ci = commit --interactive
ci-status = !hub ci-status
merge-pr = !hub merge
prshow = !hub pr show
deleteMerged = !git branch --merged | egrep -v \"(^\\*|master|dev|develop)\" | xargs git branch -d
ai = add -i .
st = status
checkoutqa = "!sh -c \"git checkout -b $1-qa\""
my-branches = "!sh -c \"git for-each-ref --format=' %(authorname) %09 %(refname)' --sort=authorname | grep \"$(git config user.name)\"\""
[diff]
tool = kdiff3
[difftool "kdiff3"]
path = kdiff3.exe
[difftool]
prompt = false
keepBackup = false
trustExitCode = false
[merge]
tool = kdiff3