albert-m
11/15/2017 - 7:08 PM

.gitcoinfig - настройки Git

[user]
  name = [USERNAME]
  email = [EMAIL]
[push]
  default = simple
[pull]
  rebase = true
[credential]
  helper = cache --timeout=3600
[core]
  autocrlf = input
[merge]
  tool = phpstorm
[diff]
  tool = phpstorm
[branch "master"]
  mergeoptions = --no-ff
[alias]
  lg = log --oneline --decorate --all --graph
  mm = !sh -c 'CURRENT=$(git rev-parse --abbrev-ref HEAD) && git checkout master && git merge $CURRENT && git push && git checkout $CURRENT' -