retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

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:
Travis Cross 2012-05-25 04:46:08 +00:00
parent 409ff21cc4
commit 771819c430
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/setup-git.sh
View File

@ -34,13 +34,14 @@ if ! git config user.email >/dev/null 2>&1; then
git config --global user.email "$email"
fi
git config pull.rebase true
git config branch.master.rebase true
cat 1>&2 <<EOF
----------------------------------------------------------------------
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,
your local changes will be rebased on top of the remote changes.