projects
/
cmccabe-etc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
97a781d
)
.gitconfig: use autosetuprebase = always
author
Colin Patrick Mccabe
<cmccabe@alumni.cmu.edu>
Wed, 15 Oct 2014 23:16:22 +0000 (16:16 -0700)
committer
Colin Patrick Mccabe
<cmccabe@alumni.cmu.edu>
Wed, 15 Oct 2014 23:17:37 +0000 (16:17 -0700)
Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>
.gitconfig
patch
|
blob
|
history
diff --git
a/.gitconfig
b/.gitconfig
index
33bf39d
..
423382a
100644
(file)
--- a/
.gitconfig
+++ b/
.gitconfig
@@
-29,3
+29,5
@@
pushInsteadOf = git://github.sf.cloudera.com/
[merge]
conflictstyle = diff3
+[branch]
+ autosetuprebase = always