提交 771819c4 authored 作者: Travis Cross's avatar Travis Cross

setup-git.sh: set pull.rebase=true

git-pull learned about pull.rebase in git-1.7.9.  This value is used
as a fallback if branch.<name>.rebase isn't found.
上级 409ff21c
...@@ -34,13 +34,14 @@ if ! git config user.email >/dev/null 2>&1; then ...@@ -34,13 +34,14 @@ if ! git config user.email >/dev/null 2>&1; then
git config --global user.email "$email" git config --global user.email "$email"
fi fi
git config pull.rebase true
git config branch.master.rebase true git config branch.master.rebase true
cat 1>&2 <<EOF cat 1>&2 <<EOF
---------------------------------------------------------------------- ----------------------------------------------------------------------
Git has been configured for FS successfully. Git has been configured for FS successfully.
branch.master.rebase has been set to true pull.rebase and branch.master.rebase have been set to true
This means that when you do a 'git pull' to fetch remote changes, This means that when you do a 'git pull' to fetch remote changes,
your local changes will be rebased on top of the remote changes. your local changes will be rebased on top of the remote changes.
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论