public
Description: My configuration files, especially on Vim
Homepage: http://kana.github.com/config/vim/
Clone URL: git://github.com/kana/config.git
config / dot.gitconfig.in
100644 68 lines (64 sloc) 1.367 kb
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
# my gitconfig
 
[user]
  name = kana
  email = nicht@s8.xrea.com
 
[color]
  ui = auto
[core]
  pager = less -r
  excludesfile = ~/.gitignore
[alias]
  b = branch
  ba = branch -a
  br = branch -r
  cb = checkout -b
  ci = commit
  co = checkout
  cob = checkout -b
  d = diff HEAD
  dl = diff HEAD^
  ds = diff --cached
  du = diff
  edit-conflicted-files = !$EDITOR $(git ls-conflicted-files)
  f = fetch
  l = log
  l1 = log --pretty=oneline
  lg = log --graph --pretty=oneline
  lr = "!$SHELL -c ' \
   n=10; \
   1=\"${1:-$n}\"; \
   if ! [ \"${1##[0-9]*}\" = \"\" ]; then \
   t=\"$1\"; \
   1=\"${2:-$n}\"; \
   2=\"$t\"; \
   fi; \
   git --no-pager l1 --reverse -\"$1\" \"${2:-HEAD}\" \
   ' __dummy__"
  ls-conflicted-files = ls-files --unmerged
  m = merge --log
  m1 = merge --log HEAD@{1}
  m2 = merge --log HEAD@{2}
  m3 = merge --log HEAD@{3}
  r1 = rebase HEAD@{1}
  r2 = rebase HEAD@{2}
  r3 = rebase HEAD@{3}
  ra = rebase --abort
  rc = rebase --continue
  rh = reset --hard
  ri = "!$SHELL -c 'git rebase -i \"HEAD~${1:-10}\"' __dummy__"
  rs = reset --soft
  rw = reset --hard ORIG_HEAD
  s = show
  s1 = show HEAD@{1}
  s2 = show HEAD@{2}
  s3 = show HEAD@{3}
  sa = stash apply
  sl = stash list
  sp = stash pop
  ss = stash save
  st = status
  staged = diff --cached
  sv = stash save
  t = tag
  unstaged = diff
 
# __END__