Git 使用笔记

• 获取并删除远端已经不存在的分支
  git fetch origin --prune

• push时遭遇conflict，手动解决,输入指令调出merge工具:
  git mergetool
  保存文件后进行commit
  git commit -m '注释'

• 查看远程仓库地址信息
  git remote -v

• 合并master
  git checkout master
git merge master

• 目录对比
  git difftool -d branch1 branch2

Git global setup:

git config --global user.name "#name#"
git config --global user.email "#emailaddress#"

Create Repository

mkdir project
cd project
git init
touch README
git add README
git commit -m 'first commit'
git remote add origin git@xx.xx.xx.xx:group/project.git
git push -u origin master

Existing Git Repo?

cd existing_git_repo
git remote add origin git@xx.xx.xx.xx:group/project.git
git push -u origin master