dotfiles/gitconfig at main · reentim/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
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
# vim: ft=gitconfig
[user]
  name = Timothy Reen
  email = reentim@gmail.com
[github]
  user = reentim
[core]
  editor = vim
  excludesfile = "~/.gitignore_global"
[color]
  ui = auto
  status = auto
  branch = auto
  interactive = auto
  diff = auto
[alias]
  aa      = add -A
  amend   = commit --amend --no-edit
  ap      = add -A --patch
  blamef  = "!. ~/.githelpers && blame_files"
  ci      = commit --verbose
  cim     = commit -m
  co      = checkout
  ctags   = "!.git/hooks/ctags"
  db      = "!. ~/.githelpers && diff_branch"
  delete-merged-branches = "!. ~/.githelpers && delete_local_merged_branches"
  delete-merged-branches-remote = "!. ~/.githelpers && delete_remote_merged_branches"
  di      = diff
  dp      = checkout --patch -- .
  ds      = diff --staged
  ff      = merge --ff-only
  fix     = "!f() { git rebase -i $1~ --autosquash; }; f"
  fixup   = commit --fixup
  from    = "!f() { git fetch && git rebase origin/master; }; f"
  l       = log --oneline --decorate --graph
  la      = "!. ~/.githelpers && log_all"
  lg      = "!. ~/.githelpers && jcoglan_graph"
  ll      = "!. ~/.githelpers && pretty_log"
  log     = "!. ~/.githelpers && log"
  logtail = "!. ~/.githelpers && tail_origin_log"
  lp      = "!. ~/.githelpers && log_patch"
  lpr     = "!. ~/.githelpers && log_patch --reverse"
  lprb    = "!. ~/.githelpers && log_patch_reverse_branch"
  lt      = "!. ~/.githelpers && truncating_log"
  mmnoff  = "!. ~/.githelpers && merge_branch_origin_to_master"
  new     = "!. ~/.githelpers && new"
  noff    = merge --no-ff
  pf      = pull --ff-only
  pretty  = "!. ~/.githelpers && pretty_log"
  r       = "!. ~/.githelpers && selecta_recent_branch"
  rc      = rebase --continue
  reword  = commit --amend --verbose
  ri      = rebase --interactive
  rom     = "!f() { git rebase $1 origin/master; }; f"
  ru      = "!. ~/.githelpers && rebase_upstream"
  s       = "!. ~/.githelpers && selecta_branch"
  search  = "!. ~/.githelpers && search"
  st      = status -sb
  u       = "!. ~/.githelpers && upstream" # TODO this should compose with git l. Or just be @{u}
  unci    = "!. ~/.githelpers && uncommit"
  unwip   = "!. ~/.githelpers && unwip"
  up      = reset --patch HEAD
  unstage = reset HEAD
  wip     = "!. ~/.githelpers && wip"
[merge]
  tool = vimdiff
  defaultToUpstream = true
[push]
  default = current
[init]
  templatedir = ~/.git_template
  defaultBranch = master
[rerere]
  enabled = true
[remote "origin"]
  prune = true
[rebase]
  autosquash = true