summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
authorMike Crute <mcrute@gmail.com>2013-11-01 13:06:38 -0400
committerMike Crute <mike@crute.us>2013-11-01 13:06:38 -0400
commit0a330de345e180f561fa17a4fab99016440035dd (patch)
treec7467edf144fbe66617b4368a6b87af683651758 /.gitconfig
parent761658e791233ae6d40dc4e002722c6a6dcf7185 (diff)
downloaddotfiles-0a330de345e180f561fa17a4fab99016440035dd.tar.bz2
dotfiles-0a330de345e180f561fa17a4fab99016440035dd.tar.xz
dotfiles-0a330de345e180f561fa17a4fab99016440035dd.zip
Update for new git
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 928dc8f..6e198ac 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -30,6 +30,7 @@
30 rc = rebase --continue 30 rc = rebase --continue
31 ri = rebase -i 31 ri = rebase -i
32 dc = diff --cached 32 dc = diff --cached
33 rc = rm --cached
33 in = !git l ..origin/master 34 in = !git l ..origin/master
34 ra = !git l --all -20 35 ra = !git l --all -20
35 lp = log --format=full -p -1 36 lp = log --format=full -p -1
@@ -60,6 +61,9 @@
60[rerere] 61[rerere]
61 enabled = true 62 enabled = true
62 63
64[push]
65 default = matching
66
63[git-pair] 67[git-pair]
64 email = mcrute@gmail.com 68 email = mcrute@gmail.com
65 69