-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
70 lines (64 loc) · 2.37 KB
/
gitconfig
File metadata and controls
70 lines (64 loc) · 2.37 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
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
68
69
70
[push]
default = simple
autoSetupRemote = true
[alias]
co = checkout
ci = commit
st = stash
br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
type = cat-file -t
dump = cat-file -p
log1 = log --oneline -20
please = push --force-with-lease
rb = !git checkout main && git fetch origin -p && git pull -r && git checkout - && git rebase main
rbd = !git checkout develop && git fetch origin -p && git pull -r && git checkout - && git rebase develop
rbdf = !git checkout development && git fetch origin -p && git pull -r && git checkout - && git rebase development
rbc = rebase --continue
rba = rebase --abort
md = !git checkout develop && git fetch origin -p && git pull -r && git checkout - && git merge develop
mr = !sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -
coml = "!f(){ git checkout master && git pull; };f"
codl = "!f(){ git checkout develop && git pull; };f"
codel = "!f(){ git checkout development && git pull; };f"
cbr = !sh -c 'git co -b $1' -
up = !sh -c 'git push origin HEAD:refs/for/$1' -
sandbox = !sh -c 'git push -u origin HEAD:sandbox/$1' -
fsandbox = !sh -c 'git push -f -u origin HEAD:sandbox/$1' -
review = !sh -c 'refname=`printf refs/changes/%02d/$1/$2 $(($1 % 100))` && git fetch origin $refname && git checkout -b $1_$2 FETCH_HEAD' -
gl = log --oneline --graph --decorate
s = status
b = branch
c = checkout
[core]
autocrlf = input
trustctime = false
excludesfile = /Users/dgubin/.gitignore_global
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[includeIf "gitdir:/projects/Pet-Projects/"]
path = .gitconfig-personal
[includeIf "gitdir:~/dotfiles/"]
path = .gitconfig-personal
[includeIf "gitdir:~/dotfiles"]
path = .gitconfig-personal
[includeIf "gitdir:/pe/"]
path = .gitconfig-work
[user]
name = Dmitry Gubin
email = dgubin@productiveedge.com
[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
[commit]
template = /Users/dgibin/.stCommitMsg
[credential]
helper = osxkeychain
[pull]
ff = only