dotfiles/dot_gitconfig at master · Macariel/dotfiles · GitHub

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
[push]
  default = simple
	autoSetupRemote = true
[core]
  editor = vim
[alias]
  st = status
  co = checkout
  cb = checkout -b
  ap = add -p
  ca = commit --amend
  ci = commit
  cm = commit --message
  cl = clone
  cv = commit --dry-run --verbose
  di = diff
  ds = diff --staged
  ri = rebase --interactive

  config-work-identiy = !git config --local user.name "\"Timo Pawelka\"" && git config --local user.email "pawelka@cqse.eu"
  config-github-identity = !git config --local user.name "Macariel" && git config --local user.email "timo.pawelka@gmail.com"

  diff-latest = diff HEAD~1
  diff-commit = !sh -c 'git diff $1~ $1' -

  show-branch-commits = "! f() { branch=`git rev-parse --abbrev-ref HEAD`; git log $branch ^master;}; f"
  list-ahead-branches = !sh -c \"git branch -v | grep 'ahead'\"
  delete-dead-branches = "! f() { git fetch -p && for branch in `git branch -vv | grep ': gone]' | awk '{print $1}'`;do git branch -D $branch; done }; f"

  log-messages = !sh -c \"git log -$1 --format=%B\" -
  lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"

  ccm = "! createCommitWithTicketId"
  cc0 = "! createCommitWithTicketId \"$1\" 0"
[merge]
  tool = intellij
[mergetool "intellij"]
  cmd = $HOME'/.local/share/JetBrains/Toolbox/apps/intellij-idea-ultimate-2/bin/idea.sh' merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
	trustExitCode = true
[diff]
	tool = intellij
[difftool "intellij"]
	cmd = $HOME'/.local/share/JetBrains/Toolbox/apps/intellij-idea-ultimate-2/bin/idea.sh' diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
	trustExitCode = true
	keepBackup = false
[mergetool]
  keepBackup = false
[safe]
  directory = /code/qtcreator-teamscale
[pull]
  rebase = false
[filter "lfs"]
  clean = git-lfs clean -- %f
  smudge = git-lfs smudge -- %f
  process = git-lfs filter-process
  required = true