File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11[user ]
2- name = silvansky
3- email = v.silvansky @gmail.com
2+ name = Petr Korolev
3+ email = sky4winder @gmail.com
44[mergetool "araxis "]
55 cmd = araxis-mergetool \" $LOCAL\" \" $REMOTE\" \" $MERGED\" \" $BASE\"
66[merge ]
77 tool = araxis
88[alias ]
9- su = submodule update
10- ci = commit
11- co = checkout
9+ # Aliases
10+ g = git
11+ gst = git status
12+ gpl = git pull
13+ gc = git commit
14+ gca = git commit -a
15+ gch = git checkout
16+ gcp = git cherry-pick
17+ gmg = merge --no-ff
18+ ch = checkout
1219 st = status
1320 mg = merge --no-ff
1421 br = branch
1522 df = diff
16- plog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
23+ ft = fetch
24+ ps = push origin
1725[core ]
18- excludesfile = ~/.gitignore_global
26+ excludesfile = /Users/p.korolev/.gitignore_global
27+ editor = nano
1928[difftool "sourcetree "]
2029 cmd = opendiff \" $LOCAL\" \" $REMOTE\"
2130 path =
2231[mergetool "sourcetree "]
2332 cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \" $LOCAL\" \" $REMOTE\" -ancestor \" $BASE\" -merge \" $MERGED\"
2433 trustExitCode = true
2534[color ]
26- ui = true
35+ ui = true
You can’t perform that action at this time.
0 commit comments