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

Enhanced the self-documentation in git setup.

This commit is contained in:
Travis Cross 2010-04-15 22:25:22 +00:00
parent 3e3b80c19d
commit 0780e04511
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/setup-git.sh
View File

@ -47,11 +47,21 @@ cat 1>&2 <<EOF
This does NOT rewrite history on the remote FS repo, but it does This does NOT rewrite history on the remote FS repo, but it does
change the commit hashes in your local tree. change the commit hashes in your local tree.
By default, 'git pull' is equivalent to running:
git fetch && git merge origin/master
What we've done here is change things such that 'git pull' is now
equivalent to:
git fetch && git rebase origin/master
If you really want to merge rather than rebasing, run: If you really want to merge rather than rebasing, run:
git merge <commit> git merge <commit>
See 'man git-config' for more information. See 'man git-config' for more information. Also see the man pages
for git-pull, git-fetch, git-merge, and git-rebase.
EOF EOF
[ -n "$name" ] \ [ -n "$name" ] \