第5章檔案管理和索引

阿新 • • 發佈：2019-02-09

5.1 關於索引的一切
Git的索引不包含任何檔案內容，它僅僅追蹤你需要提交的那些內容。當執行git commit命令的時候，Git會通過檢查索引而不是工作目錄來找到提交的內容。

5.2 Git中的檔案分類
Git將所有檔案分層3類：
已追蹤的
：已追蹤的檔案是指已經在版本庫中的檔案，或者是已暫存到索引中的檔案。git add
被忽略的
：被忽略的檔案必須在版本庫中被明確宣告為不可見或被忽略，即使它可能會在你的工作目錄中出現。
未追蹤的
：為追蹤的檔案是指那些不在前兩類中的檔案。

Administrator@BGUJ9QLXIRFWC3S MINGW32 
 /d/gittest
$ mkdir my_stuff

Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest
$ cd my_stuff/

Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff
$ git init
Initialized empty Git repository in D:/gittest/my_stuff/.git/

Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)
$ git status
On branch master

Initial 
 commit

nothing to commit (create/copy files and use "git add" to track)

Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)
$ echo "New data" > data

Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)
$ git status
On branch master

Initial commit

Untracked files:
  (use "git add <file>..." 
 to include in what will be committed)

        data

nothing added to commit but untracked files present (use "git add" to track)

git status報告一個未追蹤的檔案。

[email protected] MINGW32 /d/gittest/my_stuff (master)
$ touch main.o

[email protected] MINGW32 /d/gittest/my_stuff (master)
$ git status
On branch master

Initial commit

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        data
        main.o

nothing added to commit but untracked files present (use "git add" to track)

[email protected] MINGW32 /d/gittest/my_stuff (master)
$ echo main.o > .gitignore

[email protected] MINGW32 /d/gittest/my_stuff (master)
$ git status
On branch master

Initial commit

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        .gitignore
        data

nothing added to commit but untracked files present (use "git add" to track)

[email protected] MINGW32 /d/gittest/my_stuff (master)
$

為了讓Git忽略目錄中的檔案，只需要將該檔名新增到一個特殊的檔案.gitignore中就可以了。

5.3 使用git add
git add命令將暫存一個檔案。
可以使用git ls-files命令檢視隱藏在物件模型下的東西，並且可以找到那些暫存檔案的SHA1值。

Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)
$ git ls-files --stage
100644 0487f44090ad950f61955271cf0a2d6c6a83ad9a 0       .gitignore
100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0       data

在任何編輯之後，提交變更之前，請執行git add命令，用最新版本的檔案去更新索引。

5.4 使用git commit的一些注意事項
5.4.1 使用git commit –all
git commit的-a或者-all選項會導致執行提交之前自動暫存所有未暫存的和未追蹤的檔案變化，包括從工作副本中刪除已追蹤的檔案。

[email protected] MINGW32 /d/gittest
$ mkdir commit-all-example

[email protected] MINGW32 /d/gittest
$ cd commit-all-example/

[email protected] MINGW32 /d/gittest/commit-all-example
$ git init
Initialized empty Git repository in D:/gittest/commit-all-example/.git/

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ echo something >> ready

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ echo something else >> notyet

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git add readty notyet
fatal: pathspec 'readty' did not match any files

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git add ready notyet
warning: LF will be replaced by CRLF in notyet.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in ready.
The file will have its original line endings in your working directory.

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git commit -m "Setup"
[master (root-commit) 599023e] Setup
 2 files changed, 2 insertions(+)
 create mode 100644 notyet
 create mode 100644 ready

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git status
On branch master
nothing to commit, working tree clean

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ vim ready

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git add ready
warning: LF will be replaced by CRLF in ready.
The file will have its original line endings in your working directory.

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ vim notyet

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ mkdir subdir

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ echo Nope >> subdir/new

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   ready

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   notyet

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        subdir/


[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git commit -all
error: did you mean `--all` (with two dashes ?)

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git commit --all
warning: LF will be replaced by CRLF in notyet.
The file will have its original line endings in your working directory.
[master 5b37342] yes
 2 files changed, 2 insertions(+), 2 deletions(-)

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git status
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        subdir/

nothing added to commit but untracked files present (use "git add" to track)

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$

5.4.2 編寫提交日誌資訊

5.5 使用rm
git rm命令自然是與git add相反的命令。它會在版本庫與工作目錄中同時刪除檔案。

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ echo "Random stuff" >> cops

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git rm cops
fatal: pathspec 'cops' did not match any files

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git add cops
warning: LF will be replaced by CRLF in cops.
The file will have its original line endings in your working directory.

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        new file:   cops

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        subdir/


[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git ls-files --stage
100644 fcd87b055f261557434fa9956e6ce29433a5cd1c 0       cops
100644 5daf280806b7c3a07dccbe5e8682cd183fa9382a 0       notyet
100644 6fd96237a0210e56c126124dc8e01ba22638687e 0       ready

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git rm --cached cops
rm 'cops'

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git ls-files --stage
100644 5daf280806b7c3a07dccbe5e8682cd183fa9382a 0       notyet
100644 6fd96237a0210e56c126124dc8e01ba22638687e 0       ready

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ ls
cops  notyet  ready  subdir/

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$

git rm –cached會刪除索引中的檔案並把它保留在工作目錄中，而git rm則會將檔案從索引和工作目錄中都刪除。

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ ls
cops  notyet  ready  subdir/

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git rm ready
rm 'ready'

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        deleted:    ready

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        cops
        subdir/


[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ ls
cops  notyet  subdir/

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git add ready
fatal: pathspec 'ready' did not match any files

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git add ready
fatal: pathspec 'ready' did not match any files

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git checkout HEAD -- ready

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ cat ready
something edit

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ git status
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        cops
        subdir/

nothing added to commit but untracked files present (use "git add" to track)

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$ ls
cops  notyet  ready  subdir/

[email protected] MINGW32 /d/gittest/commit-all-example (master)
$

5.6 使用git mv
移動或者重命令檔案，可以對舊檔案使用git rm命令，然後用git add命令新增新檔案，或者可以直接使用git mv命令。

[email protected] MINGW32 /d/gittest/my_stuff (master)
$ git mv data mydata

[email protected] MINGW32 /d/gittest/my_stuff (master)
$ git status
On branch master

Initial commit

Changes to be committed:
  (use "git rm --cached <file>..." to unstage)

        new file:   .gitignore
        new file:   mydata


[email protected] MINGW32 /d/gittest/my_stuff (master)
$ git commit -m "Moved data to mydata"
[master (root-commit) db61163] Moved data to mydata
 2 files changed, 1 insertion(+)
 create mode 100644 .gitignore
 create mode 100644 mydata

[email protected] MINGW32 /d/gittest/my_stuff (master)
$ git log mydata
commit db61163b9d15f3e2f576cab69c34d614bfa9521a
Author: peter <[email protected]>
Date:   Tue Jul 4 00:01:33 2017 +0800

    Moved data to mydata

[email protected] MINGW32 /d/gittest/my_stuff (master)
$ git log --follow mydata
commit db61163b9d15f3e2f576cab69c34d614bfa9521a
Author: peter <[email protected]>
Date:   Tue Jul 4 00:01:33 2017 +0800

    Moved data to mydata

[email protected] MINGW32 /d/gittest/my_stuff (master)
$

5.7 追蹤重新命名註解

5.8 .gitignore檔案
可以將想要忽略的檔案的檔名加到同一目錄下的.gitignore中即可。此外，可以通過將檔名新增到該版本庫頂層目錄下的.gitignore檔案中來忽略它。
一個.gitignore檔案下可以包含一個檔名模式列表，指定哪些檔案要忽略。

5.9 Git中物件模型和檔案的詳細檢視

第5章檔案管理和索引

第5章檔案管理和索引

第七章檔案管理（一）——檔案和檔案系統

第5章操作架構、索引和檢視

第5章 IP地址和子網劃分（2）_IP地址分類和NAT技術

第5章 IP地址和子網劃分（4）_超網合並網段

轉載--編寫高質量代碼:改善Java程序的151個建議(第5章:數組和集合___建議65~69)

C++ Primer Plus第六版編程練習---第5章循環和關系表達式

第5章選舉模式和ZooKeeper的叢集安裝 5-1 叢集的一些基本概念

第5章：座標和依賴/5.2 座標詳解

第5章：座標和依賴/5.9 最佳實踐/5.9.2 依賴屬性使用變數

第5章：座標和依賴/5.9 最佳實踐/5.9.1 排除依賴

第七章檔案管理

第5章：函式和程式碼複用

第5章選舉模式和ZooKeeper的叢集安裝

《高效能MySQL》第5章建立高效能的索引

第5章概率分析和隨機演算法

第5章：座標和依賴/5.9 最佳實踐/5.9.3 依賴關係檢視

易學筆記--從0開始學JAVA（個人純手工筆記共享免費！免費！免費！）--第5章初始化和清理

第五章檔案管理

第七章檔案管理（二）——檔案的邏輯結構

第5章 檔案管理和索引

相關推薦

第5章檔案管理和索引