1. git configuration in ".gitconfig":
[user]
name = Haibing.Yang
email = yanghb41@gmail.com
[color]
ui = auto
[commit]
template = /home/xxx/.commit_template
[remote "kernel"]
url = ssh://yang.haibing@10.0.64.28:29418/kernel/common
receivepack = git receive-pack --reviewer=yanghb41@gmail.com --cc=yanghb41@gmail.com
[remote "u-boot"]
url = ssh://yang.haibing@10.0.64.28:29418/u-boot
receivepack = git receive-pack --reviewer=yanghb41@gmail.com --cc=yanghb41@gmail.com
[core]
editor = vim
git commit:
git commit -a -s -e
2. how to solve conflict
#git remote -v
kernel
ssh://haibing.yang@10.0.64.28:29418/kernel/common (fetch)
kernel ssh://haibing.yang@10.0.64.28:29418/kernel/common (push)
korg gitadmin@gitsrv01.spreadtrum.com:android/kernel/common (fetch)
korg gitadmin@gitsrv01.spreadtrum.com:android/kernel/common (push)
u-boot ssh://haibing.yang@10.0.64.28:29418/u-boot (fetch)
u-boot ssh://haibing.yang@10.0.64.28:29418/u-boot (push)
# git fetch korg
# git rebase korg/sprdlinux3.10
If conflict happens, first, modify the conflict, then do the following:
# git add [conflicted files]
# git rebase --continue
# git push xxx HEAD:refs/for/branch
First, rewinding head to replay your work on top of it...
Fast-forwarded HEAD to korg/sprduboot.
If you encounter the above error, issue the following command
# git rebase master
Then issue
# git rebase korg/sprduboot
3. create git server and git client
3.1 create git server
# git init --bare present.git
3.2 create git client
# git init
# git clone /work/robbie/smartphone_work/mydroid/present.git/
# git add ...
# git commit .-m "initial code"