dotfiles/gitconfig at master · mlanting/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
[alias]
    st = status
    ci = commit
    br = branch
    co = checkout
    df = diff
    dc = diff --cached
    lg = log -p
    lol = log --graph --decorate --pretty=oneline --abbrev-commit
    lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
    # Include committer name
    lolb = log --graph --pretty=format:'%C(yellow)%h%C(red bold)%d %Creset%C(blue)<%cn> %Creset%s' --abbrev-commit --all
    # Include committer name and date
    lolc = log --graph --pretty=format:'%C(yellow)%h%C(red bold)%d %Creset%C(blue)<%cn> %Creset%C(green)<%cd> %Creset%s' --abbrev-commit --all
    # Include committer and author names
    lold = log --graph --pretty=format:'%C(yellow)%h%C(red bold)%d %Creset%C(blue)<%cn> %Creset%C(green)<%an> %Creset%s' --abbrev-commit --all
    ls = ls-files

    # Show files ignored by git:
    ign = ls-files -o -i --exclude-standard
[user]
	name =
	email =
[color]
	ui = true
[merge]
    tool = splice

[mergetool "splice"]
    cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED --cmd 'let g:pathogen_disabled=[\"vim-fugitive\"]' -c 'SpliceInit'"
    trustExitCode = true
[core]
	editor = vim