iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix mail forwarded from fsf
[distro-setup]
/
.gitconfig
diff --git
a/.gitconfig
b/.gitconfig
index 47ab26a3608cf12d1dc586dbc6e67cd5fa700569..d15ab893f4f22d245693a43b568690a8c864352a 100644
(file)
--- a/
.gitconfig
+++ b/
.gitconfig
@@
-65,7
+65,7
@@
prompt = false
# or git checkout -b my-branch origin/whatever
# autoSetupMerge = always
# or git checkout -b my-branch origin/whatever
# autoSetupMerge = always
-#
git pull always doe
s rebase by default
+#
make git pull alway
s rebase by default
autoSetupRebase = always
[push]
default = simple
autoSetupRebase = always
[push]
default = simple