git的常用操作

git 常用操作

1、创建git server

mkdir gitrepo 
git --bare init

2、初始化到本地

git clone user@server:/path/name.git

3、创建branch

git branch <branch>

4、删除branch

git branch -d <branch>

5、切换branch

git checkout <branch>

6、创建并切换branch

git chekout -b <branch>

7、合并branch 到master：

git chechout master;
git merge <branch>;

8、合并改动之前，你可以使用如下命令预览差异

git diff <source_branch> <target_branch>

9、 冲突（Merge Conflict）处理：（meld is a useful three-way-compare merge tool. you can use it in G）

• 设置默认图形merge工具

  apt-get install meld;
  git config --global merge.tool meld; 
  

When you merge a branch in Git, it may get into conflict state, if you need to go on, youneed fix these conflict, but if you need to go back to the state before merge, you can you use :

• 恢复merge前状态

  git reset --hard;
  

• 修复merge 冲突

  git mergetool;
  

10、推送分支到远程

git push origin <branch>

11、丢弃你在本地的所有改动与提交， 到服务器上获取最新的版本历史

git fetch origin
git reset --hard origin/master

12、删除cached

# For a file:
    git rm --cached <file>
# For a directory:
    git rm --cached -r <directory>