dotfiles/gitconfig at master · nthx/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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
#  name = Foo Bar
#  email = foo@bar
#
[user]
[alias]
  st = status
  ba = branch -a
  co = checkout
  di = diff --color
  dis = diff --staged
  ci = commit

  #stash support
  sl = stash list
  ss = stash show
  sp = stash pop
  ss0 = stash show stash@{0}
  ss1 = stash show stash@{1}
  ss2 = stash show stash@{2}
  ss3 = stash show stash@{3}
  ss4 = stash show stash@{4}
  ss5 = stash show stash@{5}

  prs = pull --rebase --stat
  rbc = rebase --continue
  rba = rebase --abort
  rbs = rebase --skip
  cpa = cherry-pick --abort
  cp  = cherry-pick
  ma = merge --abort
  pt = push --tags
  pushf = push --force-with-lease

  #rebasing a lot?
  rbi = rebase -i HEAD~5
  rbi1 = rebase -i HEAD~1
  rbi2 = rebase -i HEAD~2
  rbi3 = rebase -i HEAD~3
  rbi4 = rebase -i HEAD~4
  rbi5 = rebase -i HEAD~5
  rbi6 = rebase -i HEAD~6
  rbi7 = rebase -i HEAD~7
  rbi10 = rebase -i HEAD~10
  rbi15 = rebase -i HEAD~15
  rbi20 = rebase -i HEAD~20
  rbi30 = rebase -i HEAD~30
  rbi40 = rebase -i HEAD~40
  rbi50 = rebase -i HEAD~50
  rhm = reset --hard origin/master
  rh70 = reset --hard origin/7.0
  rh74 = reset --hard origin/7.4
  rh75 = reset --hard origin/7.5
  rh76 = reset --hard origin/7.6
  rpo = remote prune origin #cleanup branches

  #git push origin --delete bugfix/tomekn/my-branch #removes remote branch
  #git push origin :refs/tags/3.99.0-exp #remove remote tag

  #http://blog.kfish.org/2010/04/git-lola.html
  lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
  lol = log --graph --decorate --pretty=oneline --abbrev-commit

  contributors = shortlog -sn

  #https://coderwall.com/p/ok-iyg/git-prev-next
  prev = checkout HEAD^1
  next = "!sh -c 'git log --reverse --pretty=%H master | awk \"/$(git rev-parse HEAD)/{getline;print}\" | xargs git checkout'"

[push]
  default = current

[core]
  excludesfile = /home/nthx/.gitignore

[merge]
  #merging a lot?
  conflictstyle = diff3
  ff = true

[color]
  ui = auto
  branch = auto
  diff = auto
  interactive = auto
  status = auto

[core]
  autocrlf = input

[github]
  user = nthx
#[credential]
# helper = manager-core
[credential]
  helper = store