home/dot.gitconfig-alias at master · mv/home · 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
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
# vim:ft=gitconfig:foldlevel=0:et:

[help]
    # autocorrect mispelled commands
    autocorrect = 1

[commit]
#   template = ~/.gitmessage.txt

[apply]
    ## ignore changes by whitespace only
    whitespace = nowarn

[branch]
    ## always assume --track (setup upstream info)
    # autosetupmerge = true

    ## always perform a push --rebase
    # autosetuprebase = always

[push]
#   default = tracking
    default = simple

[pull]
	rebase = false

[rebase]
    stat = true
    # autosquash = true

[status]
    relativePaths = true
    showUntrackedFiles = all

[log]
    date = iso
    decorate = short

[merge]
    summary = true
    verbosity = 2
    tool = gvimdiff
    conflictstyle = diff3

[diff]
    mnemonicprefix = true

[diff "exif"]
    textconv = exiftool


[alias]
    # simple shortcuts
    sw = show
    ls = ls-files --stage
    rshow = remote show origin

    # add
    upd = add -u -v

    # checkout
    co = checkout
    ct = checkout -t
    prior = checkout --

    # reset: git reset HEAD -- <file>
    unstage = reset HEAD --

    # commit
    cm = commit -m
    ca = commit --amend -m
    ci = commit -a -m

    # branch
    br = branch
    ba = branch -a --column
    bc = branch --contains

    # push --set-upstream origin HEAD
    pushu = push -u origin HEAD

    # status
    st = status
    sb = status -sb --ignored
    sti = status
    sbi = status -sb --ignored

    # diff
    d = diff
    dc = diff --cached
    dw = diff --word-diff

    # log
#   one = log --pretty='format:%Cgreen%h %Cred%ai %Creset%an %Creset- %s'
#   one = log --pretty='format:%C(yellow)%h %C(green)%ai %Creset%an %Creset- %s'
    one = log --pretty='format:%C(yellow bold)%h %C(cyan bold)%ai %C(green bold)%an %C(yellow)%d %C(reset)%s'
    two = log --pretty='format:%C(yellow)%h %C(green)%H %C(cyan bold)%ai %C(green bold)%an %C(yellow)%d %C(reset)%s'
    gr  = log --pretty=oneline --graph --abbrev-commit --decorate
    logp = log -p
    logs = log --stat --summary
    last = log -1
    #ast = log -1 HEAD

    # submodule
    si = submodule init
    su = submodule update
    ss = submodule status

    # stash
    stash-unapply = '!git stash show -p | git apply -R'