mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-03-31 02:33:44 +00:00
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.
This commit is contained in:
parent
409ff21cc4
commit
771819c430
@ -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.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user