git 各区的关系

git 各区的关系

• remote repository 远程版本库，一般存在服务器端。
• repository 本地版本库。
• staging area 暂时存区，也叫index。
• working directory 工作区。
• stash 储藏区。

各区示意图

                        +----------------------+        +----------------------+
                        |      repository      |        |   remote repository  |
                        +----------------------+        +----------------------+

                        +----------------------+
                        |     staging area     |
                        +----------------------+

                        +----------------------+
                        |   working directory  |
                        +----------------------+

                        +----------------------+
                        |       stash          |
                        +----------------------+

下文中：

• bxx 表示branch
• cxx 表示commit
• fxx 表示file

git reset

            +--------   +----------------------+
            |           |      repository      |
            |   +----   +----------------------+
            |   |
            | git reset --soft
            |   |
            |   +--->   +----------------------+
    git reset --hard    |     staging area     |
            +------->   +----------------------+
            |
            |
            |
            +------->   +----------------------+
                        |   working directory  |
                        +----------------------+

git checkout

            +--------   +----------------------+
            |           |      repository      |
            |           +----------------------+
    git checkout cxx fxx
            |
            |
            |------->   +----------------------+
            |           |     staging area     |
            |   +----   +----------------------+
            |   |
            | git checkout fxx
            |   |
            |   +--->   +----------------------+
            |           |   working directory  |
            +------->   +----------------------+

git commit / add

                        +----------------------+   <-------+
                        |      repository      |           |
                        +----------------------+   <---+   |
                                                       |   |
                                            git commit |   |
                                                       |   |
                        +----------------------+   ----+   |
                        |     staging area     |           | git commit -a
                        +----------------------+   <---+   |
                                                       |   |
                                              git add  |   |
                                                       |   |
                        +----------------------+   ----+   |
                        |   working directory  |           |
                        +----------------------+   --------+

git stash

                        +----------------------+
                        |     staging area     |
                        +----------------------+   <-------+
                                                           |
                                                           |
                                                           |                                 
                        +----------------------+   <-------+ git stash pop --index
                        |   working directory  |           | git stash apply x --index
                +----   +----------------------+   <---+   |
                |                        git stash pop |   |
                | git stash              git stash apply x |
                |                                      |   |
                +--->   +----------------------+   ----+   |
                        |       stash          |           |
                        +----------------------+   --------+

git fetch / push

                                               git fetch
                                               +--------+
                                               |        |
                                               V        | 

                        +----------------------+        +----------------------+
                        |      repository      |        |   remote repository  |
                        +----------------------+        +----------------------+

                                               |        ^
                                               |        |
                                               +--------+
                                                git push