仓库源文，站点原文

title: git版本管理策略及相关技巧(A) categories:

• 前端杂烩 tags:
• tech
• cnblogs
• git date: 2014-05-07 09:00:00 fromUrl: http://www.cnblogs.com/hustskyking/archive/2014/05/07/git-improve.html from: 博客园

cd dir  # 这里不用新建一个项目名的文件夹，dir为git文件夹的父文件夹
git clone //github.com/barretlee/Micro-Share

cd path/to/Project
git init
# 添加远程目录
git remote add origin //github.com/barretlee/Micro-Share

git remote add origin //github.com/barretlee/Micro-Share
git remote add mine http://your/path/to/git
# 拉取远程代码到 init 之后的 master 主干上
git fetch origin master
# 修改代码之后，提交到自己的仓库
git commit -am "fist"
git push -u mine master

git add .

#方式一
git add --all .
#方式二
git add -A .

<ul>

<li><code>--all</code> 参数，顾名思义，添加所有文件（change|delete|add）</li>

<li><code>-A</code> 参数，添加修改过和删除过的文件（change|delete）</li>

<li>不加 参数，添加修改过和添加的文件（change|add）</li> </ul>

git commit -m "comment"

git commit -am "add and commit"

# 将 master 提交到 origin 上
git push origin master

# 拉去远程分支到 master
git pull origin master

git push -u origin master -f

+-----------+      +-----------+       +-----------+
|           |      |           |       |           |
|  working  | -->  |   index   |  -->  |  commit   |
|           |      |           |       |           |
+-----------+      +-----------+       +-----------+
      ↓                  ↓                   ↓
   当前操作            git add            git commit

                              <Created By Barret Lee>

</created>

git stash

last commit ... working file now

git stash pop

+---------------+      +-----------+      +-----------+       +-----------+
|               |      |           |      |           |       |           |
|  last commit  | -->  |  working  | -->  |   index   |  -->  |  commit   |
|               |      |           |      |           |       |           |
+---------------+  ↑   +-----------+      +-----------+   |   +-----------+
      ↓            |         ↓                  ↓         |          ↓
   上次提交         |      当前操作            git add      |    git commit
                   |                                     s|
                   |                                     t|
                   |       +---------+                   a|
                   |       | Stash 0 |                   s|
                   |       +---------+                   h|
                   +------ | Stash 1 | <------------------+
                           +---------+
                           |  ....   |
                           +---------+
                           | Stash n |
                           +---------+
                                ↓                    <Created By Barret Lee>
                             stash堆栈

# 进入文件夹
$ cd test
# 初始化 git
$ it init
# 新建四个文件
$ touch f1 f2 f3 f4

# 修改 f1
$ echo "1" > f1
# 将修改 push 到 stash 栈堆中
$ git stash

# 查看 stash 栈堆
$ git stash list
  stash@{0}: WIP on master: 7f58be2 3

# 修改 f2
$ echo "1" > f2
# 添加修改
$ git add .
# 将修改 push 到 stash 栈堆中
$ git stash

# 查看 stash 栈堆
$ git stash list
    stash@{0}: WIP on master: 7f58be2 3
    stash@{1}: WIP on master: 7f58be2 3

# pop 栈堆，还原修改
$ git stash pop

# 查看文件状态
git status
$ Changes not staged for commit:
    changed: f2
  please commit it

git stash clear

git diff HEAD~1 HEAD

git diff HEAD~3 HEAD

HEAD^^

HEAD^^^^^

git log

git diff SHA1 SHA2

git diff --cached

git reset

git reset HEAD filename  # 从暂存区移除文件

git reset --hard HEAD~n

git reset --hard SHA

git branch

git branch -va

git branch branch_name

git branch -b branchnew branchold

# 选择一
# 先切换到 B 分支上
git checkout B
git branch C

# 选择二
git branch -b C B

git checkout branch_name

git checkout remotes/origin/branch_name
git checkout branch_name

git branch -d branch_name

git push origin :branch_name

</blockquote>