projects
/
dotfiles-public.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
46bb772
)
.gitconfig: Enable rerere support
author
W. Trevor King
<wking@tremily.us>
Thu, 19 Sep 2013 02:29:44 +0000
(19:29 -0700)
committer
W. Trevor King
<wking@tremily.us>
Thu, 19 Sep 2013 02:29:44 +0000
(19:29 -0700)
Re-merging and re-rebasing are not fun when you have to keep repeating
your previous conflict resolution. See git-rerere(1) for details.
src/.gitconfig
patch
|
blob
|
history
diff --git
a/src/.gitconfig
b/src/.gitconfig
index cac6f3a3a6b2895c7bdefc5eaed4f6aeb0f11563..5b5993287b870220ec7916e94fef72fa527423f9 100644
(file)
--- a/
src/.gitconfig
+++ b/
src/.gitconfig
@@
-24,6
+24,9
@@
textconv = gpg -v
xfuncname = "^((pub|uid) .*)"
+[rerere]
+ enabled = true
+
[alias]
authors = shortlog -se
glog = log --graph --topo-order --oneline --decorate