summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
authorMike Crute <crutem@amazon.com>2015-03-05 18:43:29 -0800
committerMike Crute <mike@crute.us>2015-03-05 18:43:29 -0800
commitdae8a1a770ed7b0bc2d9f2bba60b31ff2b6167b6 (patch)
treea7655085c0a83ff173411b662019c495800d078d /.gitconfig
parent3595b45f9984dd361b47444d3d7e37d4d351adce (diff)
downloaddotfiles-dae8a1a770ed7b0bc2d9f2bba60b31ff2b6167b6.tar.bz2
dotfiles-dae8a1a770ed7b0bc2d9f2bba60b31ff2b6167b6.tar.xz
dotfiles-dae8a1a770ed7b0bc2d9f2bba60b31ff2b6167b6.zip
Sync work state
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitconfig b/.gitconfig
index ea0e8a9..f76f7e2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -53,6 +53,8 @@
53 out = !git l origin/master.. 53 out = !git l origin/master..
54 dag = log --graph --format='format:%C(yellow)%h%C(reset) %C(blue)\"%an\" <%ae>%C(reset) %C(magenta)%cr%C(reset)%C(auto)%d%C(reset)%n%s' --date-order 54 dag = log --graph --format='format:%C(yellow)%h%C(reset) %C(blue)\"%an\" <%ae>%C(reset) %C(magenta)%cr%C(reset)%C(auto)%d%C(reset)%n%s' --date-order
55 55
56 made = log --reverse --format='format:%C(blue)%an%C(reset) <%ae> %C(green)(%ar)%C(reset)'
57
56[color] 58[color]
57 ui = auto 59 ui = auto
58 60
@@ -63,7 +65,7 @@
63 user = mcrute 65 user = mcrute
64 66
65[format] 67[format]
66 pretty=format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset 68 pretty = format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset
67 69
68[merge] 70[merge]
69 tool = vimdiff 71 tool = vimdiff