Git Tools - Submodules

Git Tools - Submodules

1. 應(yīng)用場(chǎng)景

需求

當(dāng)你在一個(gè)項(xiàng)目 project1 上工作時(shí),你需要在其中使用另外一個(gè)項(xiàng)目 lib1 幽七。也許它是一個(gè)第三方開(kāi)發(fā)的庫(kù)或者是你獨(dú)立開(kāi)發(fā)和并在多個(gè)父項(xiàng)目 (priject2熄浓,prject2 ... ...)中使用的糜芳。這個(gè)場(chǎng)景下一個(gè)常見(jiàn)的問(wèn)題產(chǎn)生了:你想將兩個(gè)項(xiàng)目 priject1鲁纠、lib1 單獨(dú)處理但是又需要在其中一個(gè) project1 中使用另外一個(gè) lib1工禾。

解決方案

不使用 git submodules 的方法:包含庫(kù)

  • 包含庫(kù):把 lib1 代碼包含到 project1 (project2 运提、project3 ... ...)項(xiàng)目中
  • 問(wèn)題 : 定制和部署 project 更加困難了。
  • 產(chǎn)生問(wèn)題的原因 :因?yàn)槟惚仨毚_保每個(gè)客戶(hù)都擁有 lib1 闻葵。并且當(dāng) lib1 被修改時(shí)(fix bug)民泵,任何在 project1 (project2 、project3 ... ...) 中對(duì) lib1 的修改都很難歸并槽畔。
《Git權(quán)威指南》
項(xiàng)目的版本庫(kù)在某些情況下需要引用其他版本庫(kù)中的文件栈妆,
例如公司積累了一套常用的函數(shù)庫(kù),被多個(gè)項(xiàng)目調(diào)用厢钧,顯然這個(gè)函數(shù)庫(kù)的代碼不能直接放到某個(gè)項(xiàng)目的代碼中鳞尔,而是要獨(dú)立為一個(gè)代碼庫(kù),那么其他項(xiàng)目要調(diào)用公共函數(shù)庫(kù)該如何處理呢早直?
分別把公共函數(shù)庫(kù)的文件拷貝到各自的項(xiàng)目中會(huì)造成冗余寥假,丟棄了公共函數(shù)庫(kù)的維護(hù)歷史,這顯然不是好的方法霞扬。

Git Submodules

Git 通過(guò)子模塊處理這個(gè)問(wèn)題昧旨。子模塊允許你將一個(gè) Git 倉(cāng)庫(kù)當(dāng)作另外一個(gè)Git倉(cāng)庫(kù)的子目錄。這允許你克隆另外一個(gè)倉(cāng)庫(kù)到你的項(xiàng)目中并且保持你的提交相對(duì)獨(dú)立祥得。學(xué)會(huì) git submodule 可以使項(xiàng)目中再也不會(huì)出現(xiàn)大量
重復(fù)的資源文件兔沃、公共類(lèi)庫(kù)。更不會(huì)出現(xiàn)多個(gè)版本级及,甚至一個(gè)客戶(hù)多個(gè)項(xiàng)目風(fēng)格存在各種差異乒疏。

2. Learning Example

本例子采用兩個(gè)項(xiàng)目以及兩個(gè)公共類(lèi)庫(kù)學(xué)習(xí)對(duì)submodule的操作

2.1 創(chuàng)建 Git Submodule 測(cè)試項(xiàng)目

2.1.1 準(zhǔn)備環(huán)境

  • 當(dāng)前目錄
?  ~ pwd
/Users/yjizhang
?  ~ mkdir -p submd/repos
  • 創(chuàng)建需要的本地倉(cāng)庫(kù)
?  ~ cd ~/submd/repos
?  repos git --git-dir=lib1.git init --bare
Initialized empty Git repository in /Users/yjizhang/submd/repos/lib1.git/
?  repos git --git-dir=lib2.git init --bare
Initialized empty Git repository in /Users/yjizhang/submd/repos/lib2.git/
?  repos git --git-dir=p1.git init --bare
Initialized empty Git repository in /Users/yjizhang/submd/repos/p1.git/
?  repos git --git-dir=p2.git init --bare
Initialized empty Git repository in /Users/yjizhang/submd/repos/p2.git/
?  repos ls
lib1.git lib2.git p1.git   p2.git
  • 初始化工作區(qū)
?  ~ mkdir ~/submd/ws
?  ~ cd submd/ws

2.1.2 初始化項(xiàng)目

  • 初始化 p1 (project1)
?  ~ cd ~/submd/ws
?  ws git clone ../repos/p1.git
Cloning into 'p1'...
warning: You appear to have cloned an empty repository.
done.
?  ws cd p1
?  p1 git:(master) echo "p1" >> p1-infos.txt
?  p1 git:(master) ? ls
p1-infos.txt
?  p1 git:(master) ? gst
On branch master

Initial commit

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

    p1-infos.txt

nothing added to commit but untracked files present (use "git add" to track)
?  p1 git:(master) ? git add p1-infos.txt
?  p1 git:(master) ? gst
On branch master

Initial commit

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

    new file:   p1-infos.txt

?  p1 git:(master) ? gc -m "init p1"
[master (root-commit) 960cb75] init p1
 1 file changed, 1 insertion(+)
 create mode 100644 p1-infos.txt
?  p1 git:(master) git push origin master
Counting objects: 3, done.
Writing objects: 100% (3/3), 217 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To /Users/yjizhang/submd/ws/../repos/p1.git
 * [new branch]      master -> master
?  p1 git:(master)
  • 初始化 p2
?  ~ cd ~/submd/ws
?  ws git clone ../repos/p2.git
Cloning into 'p2'...
warning: You appear to have cloned an empty repository.
done.
?  ws cd p2
?  p2 git:(master) gst
On branch master

Initial commit

nothing to commit (create/copy files and use "git add" to track)
?  p2 git:(master) echo "p2" >> p2-infos.txt
?  p2 git:(master) ? ls
p2-infos.txt
?  p2 git:(master) ? gst
On branch master

Initial commit

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

    p2-infos.txt

nothing added to commit but untracked files present (use "git add" to track)
?  p2 git:(master) ? git add p2-infos.txt
?  p2 git:(master) ? gst
On branch master

Initial commit

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

    new file:   p2-infos.txt

?  p2 git:(master) ? gc -m "init p2"
[master (root-commit) 449e7ed] init p2
 1 file changed, 1 insertion(+)
 create mode 100644 p2-infos.txt
?  p2 git:(master) gst
On branch master
Your branch is based on 'origin/master', but the upstream is gone.
  (use "git branch --unset-upstream" to fixup)
nothing to commit, working tree clean
?  p2 git:(master) git push origin master
Counting objects: 3, done.
Writing objects: 100% (3/3), 217 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To /Users/yjizhang/submd/ws/../repos/p2.git
 * [new branch]      master -> master
?  p2 git:(master)

2.1.3 初始化公共類(lèi)庫(kù)

  • 初始化公共類(lèi)庫(kù) lib1
?  ~ cd ~/submd/ws
?  ws git clone ../repos/lib1.git
Cloning into 'lib1'...
warning: You appear to have cloned an empty repository.
done.
?  ws cd lib1
?  lib1 git:(master) echo "I'm lib1" > lib1-features
?  lib1 git:(master) ? git add lib1-features
?  lib1 git:(master) ? gc -m "init lib1"
[master (root-commit) 101b2e6] init lib1
 1 file changed, 1 insertion(+)
 create mode 100644 lib1-features
?  lib1 git:(master) git push origin master
Counting objects: 3, done.
Writing objects: 100% (3/3), 224 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To /Users/yjizhang/submd/ws/../repos/lib1.git
 * [new branch]      master -> master
  • 初始化公共類(lèi)庫(kù) lib2
?  lib1 git:(master) cd ~/submd/ws
?  ws git clone ../repos/lib2.git
Cloning into 'lib2'...
warning: You appear to have cloned an empty repository.
done.
?  ws cd lib2
?  lib2 git:(master) echo "I'm lib2" >> lib2-features
?  lib2 git:(master) ? git add lib2-features
?  lib2 git:(master) ? gc -m "init lib2"
[master (root-commit) fa8fdee] init lib2
 1 file changed, 1 insertion(+)
 create mode 100644 lib2-features
?  lib2 git:(master) git push origin master
Counting objects: 3, done.
Writing objects: 100% (3/3), 225 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To /Users/yjizhang/submd/ws/../repos/lib2.git
 * [new branch]      master -> master

2.2 為主項(xiàng)目添加 Submodules

2.2.1 為 p1 添加 lib1 和 lib2

  • 命令git submodule add
?  cd ~/submd/ws/p1
?  p1 git:(master) ls
p1-infos.txt
?  p1 git:(master) git submodule add ~/submd/repos/lib1.git libs/lib1
Cloning into '/Users/yjizhang/submd/ws/p1/libs/lib1'...
done.
?  p1 git:(master) ? git submodule add ~/submd/repos/lib2.git libs/lib2
Cloning into '/Users/yjizhang/submd/ws/p1/libs/lib2'...
done.
?  p1 git:(master) ? gst
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    new file:   .gitmodules
    new file:   libs/lib1
    new file:   libs/lib2

?  p1 git:(master) ? tree
.
├── libs
│   ├── lib1
│   │   └── lib1-features
│   └── lib2
│       └── lib2-features
└── p1-infos.txt

3 directories, 3 files
?  p1 git:(master) ? cat libs/lib1/lib1-features
I'm lib1
?  p1 git:(master) ? cat libs/lib2/lib2-features
I'm lib2

此時(shí)我們已經(jīng)成功使用 git submodule add 命令為 p1 添加了兩個(gè)公共類(lèi)庫(kù) lib1 lib2,那么我們?cè)鯓硬榭醋幽K是否已經(jīng)添加成功了呢 饮焦?

2.2.2 查看 .gitmodules 的內(nèi)容

  • .gitmodules : 該文件記錄了每個(gè) submodule 的引用信息以及其在當(dāng)前項(xiàng)目的位置以及倉(cāng)庫(kù)所在地址
?  p1 git:(master) ? cat .gitmodules
[submodule "libs/lib1"]
    path = libs/lib1
    url = /Users/yjizhang/submd/repos/lib1.git
[submodule "libs/lib2"]
    path = libs/lib2
    url = /Users/yjizhang/submd/repos/lib2.git

2.2.3 提交添加子模塊的更改

?  p1 git:(master) ? gst
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    new file:   .gitmodules
    new file:   libs/lib1
    new file:   libs/lib2
?  p1 git:(master) ? git commit -a -m "add submodule [lib1怕吴、lib2] to p1"
[master 65a41b4] add submodule [lib1窍侧、lib2] to p1
 3 files changed, 8 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 libs/lib1
 create mode 160000 libs/lib2
?  p1 git:(master) git push
Counting objects: 4, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 488 bytes | 0 bytes/s, done.
Total 4 (delta 0), reused 0 (delta 0)
To /Users/yjizhang/submd/ws/../repos/p1.git
   960cb75..65a41b4  master -> master

假設(shè)你是第一次引入公共類(lèi)庫(kù) lib1、lib2 到 p1 的開(kāi)發(fā)人員转绷,name項(xiàng)目組的其他人要怎么 Clone 帶有 Submodules 的項(xiàng)目呢 伟件?

2.3 Clone 帶有 Submodule 的倉(cāng)庫(kù)

模擬開(kāi)發(fā)人員 B Clone 帶有 Submodule 的項(xiàng)目 p1

2.3.1 Clone 帶有 submodule 的庫(kù) p1

?  ~ cd ~/submd/ws
?  ws git clone ../repos/p1.git p1-b
Cloning into 'p1-b'...
done.
?  ws ls
lib1 lib2 p1   p1-b p2

# clone 成功,查看 p1-b  dir tree

?  ws cd p1-b
?  p1-b git:(master) tree
.
├── libs
│   ├── lib1
│   └── lib2
└── p1-infos.txt

# 對(duì)比 p1-b 和 p1 的 dir tree

?  p1-b git:(master) cd ../p1
?  p1 git:(master) tree
.
├── libs
│   ├── lib1
│   │   └── lib1-features
│   └── lib2
│       └── lib2-features
└── p1-infos.txt

3 directories, 3 files

發(fā)現(xiàn) 我們 clone 的 p1-b 中 submodule [lib1议经、lib2] 的內(nèi)容并沒(méi)有 clone 下來(lái)斧账。我們可以查看一下子模塊,那么怎么查看子模塊狀態(tài)呢 煞肾?

2.3.2 查看子模塊狀態(tài) git submodule

?  p1-b git:(master) git submodule
-101b2e60e0f8c759d2f60c7fca12f3b1e474de21 libs/lib1
-fa8fdeed9d7c8938c0fe470766c568fb32b1ed14 libs/lib2

?  p1-b git:(master) cd ../p1
?  p1 git:(master) git submodule
 101b2e60e0f8c759d2f60c7fca12f3b1e474de21 libs/lib1 (heads/master)
 fa8fdeed9d7c8938c0fe470766c568fb32b1ed14 libs/lib2 (heads/master)

- 表示該子模塊還沒(méi)有檢出咧织,怎么檢出子模塊內(nèi)容 ?

2.3.3 檢出子模塊內(nèi)容 git submodule init & git submodule update

  • git submodule init 初始化本地配置文件 .git/config
  • git submodule update 從指定項(xiàng)目 .git/config 拉取所有數(shù)據(jù)并檢出你上層項(xiàng)目里所列的合適的提交
?  p1-b git:(master) git submodule
-101b2e60e0f8c759d2f60c7fca12f3b1e474de21 libs/lib1
-fa8fdeed9d7c8938c0fe470766c568fb32b1ed14 libs/lib2
?  p1-b git:(master) cat .git/config
[core]
    repositoryformatversion = 0
    filemode = true
    bare = false
    logallrefupdates = true
    ignorecase = true
    precomposeunicode = true
[remote "origin"]
    url = /Users/yjizhang/submd/ws/../repos/p1.git
    fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
    remote = origin
    merge = refs/heads/master
?  p1-b git:(master) git submodule init
Submodule 'libs/lib1' (/Users/yjizhang/submd/repos/lib1.git) registered for path 'libs/lib1'
Submodule 'libs/lib2' (/Users/yjizhang/submd/repos/lib2.git) registered for path 'libs/lib2'
?  p1-b git:(master) cat .git/config
[core]
    repositoryformatversion = 0
    filemode = true
    bare = false
    logallrefupdates = true
    ignorecase = true
    precomposeunicode = true
[remote "origin"]
    url = /Users/yjizhang/submd/ws/../repos/p1.git
    fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
    remote = origin
    merge = refs/heads/master
[submodule "libs/lib1"]
    url = /Users/yjizhang/submd/repos/lib1.git
[submodule "libs/lib2"]
    url = /Users/yjizhang/submd/repos/lib2.git
?  p1-b git:(master) git submodule update
Cloning into '/Users/yjizhang/submd/ws/p1-b/libs/lib1'...
done.
Cloning into '/Users/yjizhang/submd/ws/p1-b/libs/lib2'...
done.
Submodule path 'libs/lib1': checked out '101b2e60e0f8c759d2f60c7fca12f3b1e474de21'
Submodule path 'libs/lib2': checked out 'fa8fdeed9d7c8938c0fe470766c568fb32b1ed14'
?  p1-b git:(master) git submodule
 101b2e60e0f8c759d2f60c7fca12f3b1e474de21 libs/lib1 (heads/master)
 fa8fdeed9d7c8938c0fe470766c568fb32b1ed14 libs/lib2 (heads/master)
?  p1-b git:(master) tree
.
├── libs
│   ├── lib1
│   │   └── lib1-features
│   └── lib2
│       └── lib2-features
└── p1-infos.txt

3 directories, 3 files
?  p1-b git:(master) cat libs/lib1/lib1-features libs/lib2/lib2-features
I'm lib1
I'm lib2

2.4 修改該有 Submodule 的庫(kù)

模擬開(kāi)發(fā)人員 B 修改子模塊內(nèi)容

2.4.1 查看子模塊

?  p1-b git:(master) cd libs/lib1
?  lib1 git:(101b2e6) gst
HEAD detached at 101b2e6
nothing to commit, working tree clean

發(fā)現(xiàn)子模塊 lib1 在一個(gè)匿名的分支上,為什么 籍救?

  • 原因: Git 對(duì)于 Submodule 有特殊的處理方式习绢。

  • 一個(gè)主項(xiàng)目中引入 Submodule 其實(shí) Git 做了三件事

    • 記錄引用的倉(cāng)庫(kù) (子模塊倉(cāng)庫(kù)描述)
    • 記錄主項(xiàng)目中 Submodule 的目錄位置
    • 記錄引用 Submodule 的 commit id
  • 說(shuō)明
    在 p1 中 push 之后其實(shí)是在 p1 中記錄了對(duì) submodule 提交的引用 commit id
    然后 p1-b 在 clone p1 的時(shí)候獲取到了 p1 對(duì) submodule 提交的引用 commit id
    當(dāng) p1-b 中執(zhí)行 git submodule update 的時(shí)候, git 根據(jù) modules 獲取到了 submodule 的 commit id , 然后獲取 submodule 的文件。
    所以 clone 之后子模塊不在任何分支上蝙昙,但是 master 分支和 commit id 和 HEAD 保持一致闪萄。

2.4.2 更新子模塊

  • 切換到 master 分支
  • 更新子模塊內(nèi)容
  • 提交子模塊更新
  • 提交主項(xiàng)目中子模塊更新引用
#  切換到 master 分支

?  p1-b git:(master) cd libs/lib1
?  lib1 git:(101b2e6) gco master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.

#  更新子模塊內(nèi)容

?  lib1 git:(master) echo "add by developer b" >> lib1-features

#  提交子模塊更新

?  lib1 git:(master) ? ga .
?  lib1 git:(master) ? gc -m "update lib1-feature by dev b"
[master 241e03b] update lib1-feature by dev b
 1 file changed, 1 insertion(+)
?  lib1 git:(master) git push
Counting objects: 3, done.
Writing objects: 100% (3/3), 286 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To /Users/yjizhang/submd/repos/lib1.git
   101b2e6..241e03b  master -> master
   
#  提交主項(xiàng)目中子模塊更新引用

?  lib1 git:(master) cd ../../
?  p1-b git:(master) ? git diff
diff --git a/libs/lib1 b/libs/lib1
index 101b2e6..241e03b 160000
--- a/libs/lib1
+++ b/libs/lib1
@@ -1 +1 @@
-Subproject commit 101b2e60e0f8c759d2f60c7fca12f3b1e474de21
+Subproject commit 241e03bf0bf574063417c05a1d558fa4a6006425
(END)   

?  p1-b git:(master) ? gst
On branch master
Your branch is up-to-date with 'origin/master'.
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:   libs/lib1 (new commits)

no changes added to commit (use "git add" and/or "git commit -a")
?  p1-b git:(master) ? git add libs/lib1
?  p1-b git:(master) ? gst
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    modified:   libs/lib1

?  p1-b git:(master) ? gc -m "update libs/lib1 to lastest commit id"
[master ea785a2] update libs/lib1 to lastest commit id
 1 file changed, 1 insertion(+), 1 deletion(-)
?  p1-b git:(master) git push
Counting objects: 3, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 389 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To /Users/yjizhang/submd/ws/../repos/p1.git
   65a41b4..ea785a2  master -> master

現(xiàn)在我們已經(jīng)在 p1-b 中更新了子模塊 lib1 的內(nèi)容。那么我們?cè)鯓油礁?p1 中 lib1 的內(nèi)容呢 奇颠?

2.5 更新主項(xiàng)目的 Submodule

  • 拉取主項(xiàng)目最新更新 git pullgit pull -r (推薦.其會(huì)將本地提交放在遠(yuǎn)程提交的最后败去,減少?zèng)_突)
  • 拉取子模塊更新的內(nèi)容 git submodule update (注:在執(zhí)行前明確保已經(jīng)執(zhí)行了 git submodule init 將子模塊信息注冊(cè)到 .git/congfig 中)
?  p1-b git:(master) cd ../p1
?  p1 git:(master) gst
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working tree clean
?  p1 git:(master) git pull
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From /Users/yjizhang/submd/ws/../repos/p1
   65a41b4..ea785a2  master     -> origin/master
Fetching submodule libs/lib1
From /Users/yjizhang/submd/repos/lib1
   101b2e6..241e03b  master     -> origin/master
Updating 65a41b4..ea785a2
Fast-forward
 libs/lib1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
?  p1 git:(master) ? gst
On branch master
Your branch is up-to-date with 'origin/master'.
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:   libs/lib1 (new commits)

no changes added to commit (use "git add" and/or "git commit -a")
?  p1 git:(master) ? git submodule update
Submodule path 'libs/lib1': checked out '241e03bf0bf574063417c05a1d558fa4a6006425'
?  p1 git:(master) cat libs/lib1/lib1-features
I'm lib1
add by developer b

參考

http://www.kafeitu.me/git/2012/03/27/git-submodule.html

?著作權(quán)歸作者所有,轉(zhuǎn)載或內(nèi)容合作請(qǐng)聯(lián)系作者
  • 序言:七十年代末,一起剝皮案震驚了整個(gè)濱河市大刊,隨后出現(xiàn)的幾起案子,更是在濱河造成了極大的恐慌三椿,老刑警劉巖缺菌,帶你破解...
    沈念sama閱讀 222,681評(píng)論 6 517
  • 序言:濱河連續(xù)發(fā)生了三起死亡事件,死亡現(xiàn)場(chǎng)離奇詭異搜锰,居然都是意外死亡伴郁,警方通過(guò)查閱死者的電腦和手機(jī),發(fā)現(xiàn)死者居然都...
    沈念sama閱讀 95,205評(píng)論 3 399
  • 文/潘曉璐 我一進(jìn)店門(mén)蛋叼,熙熙樓的掌柜王于貴愁眉苦臉地迎上來(lái)焊傅,“玉大人,你說(shuō)我怎么就攤上這事狈涮『ィ” “怎么了?”我有些...
    開(kāi)封第一講書(shū)人閱讀 169,421評(píng)論 0 362
  • 文/不壞的土叔 我叫張陵歌馍,是天一觀(guān)的道長(zhǎng)握巢。 經(jīng)常有香客問(wèn)我,道長(zhǎng)松却,這世上最難降的妖魔是什么暴浦? 我笑而不...
    開(kāi)封第一講書(shū)人閱讀 60,114評(píng)論 1 300
  • 正文 為了忘掉前任溅话,我火速辦了婚禮,結(jié)果婚禮上歌焦,老公的妹妹穿的比我還像新娘飞几。我一直安慰自己,他們只是感情好独撇,可當(dāng)我...
    茶點(diǎn)故事閱讀 69,116評(píng)論 6 398
  • 文/花漫 我一把揭開(kāi)白布屑墨。 她就那樣靜靜地躺著,像睡著了一般券勺。 火紅的嫁衣襯著肌膚如雪绪钥。 梳的紋絲不亂的頭發(fā)上,一...
    開(kāi)封第一講書(shū)人閱讀 52,713評(píng)論 1 312
  • 那天关炼,我揣著相機(jī)與錄音程腹,去河邊找鬼。 笑死儒拂,一個(gè)胖子當(dāng)著我的面吹牛寸潦,可吹牛的內(nèi)容都是我干的。 我是一名探鬼主播社痛,決...
    沈念sama閱讀 41,170評(píng)論 3 422
  • 文/蒼蘭香墨 我猛地睜開(kāi)眼见转,長(zhǎng)吁一口氣:“原來(lái)是場(chǎng)噩夢(mèng)啊……” “哼!你這毒婦竟也來(lái)了蒜哀?” 一聲冷哼從身側(cè)響起斩箫,我...
    開(kāi)封第一講書(shū)人閱讀 40,116評(píng)論 0 277
  • 序言:老撾萬(wàn)榮一對(duì)情侶失蹤,失蹤者是張志新(化名)和其女友劉穎撵儿,沒(méi)想到半個(gè)月后乘客,有當(dāng)?shù)厝嗽跇?shù)林里發(fā)現(xiàn)了一具尸體,經(jīng)...
    沈念sama閱讀 46,651評(píng)論 1 320
  • 正文 獨(dú)居荒郊野嶺守林人離奇死亡淀歇,尸身上長(zhǎng)有42處帶血的膿包…… 初始之章·張勛 以下內(nèi)容為張勛視角 年9月15日...
    茶點(diǎn)故事閱讀 38,714評(píng)論 3 342
  • 正文 我和宋清朗相戀三年易核,在試婚紗的時(shí)候發(fā)現(xiàn)自己被綠了。 大學(xué)時(shí)的朋友給我發(fā)了我未婚夫和他白月光在一起吃飯的照片浪默。...
    茶點(diǎn)故事閱讀 40,865評(píng)論 1 353
  • 序言:一個(gè)原本活蹦亂跳的男人離奇死亡牡直,死狀恐怖,靈堂內(nèi)的尸體忽然破棺而出纳决,到底是詐尸還是另有隱情碰逸,我是刑警寧澤,帶...
    沈念sama閱讀 36,527評(píng)論 5 351
  • 正文 年R本政府宣布阔加,位于F島的核電站花竞,受9級(jí)特大地震影響,放射性物質(zhì)發(fā)生泄漏。R本人自食惡果不足惜约急,卻給世界環(huán)境...
    茶點(diǎn)故事閱讀 42,211評(píng)論 3 336
  • 文/蒙蒙 一零远、第九天 我趴在偏房一處隱蔽的房頂上張望。 院中可真熱鬧厌蔽,春花似錦牵辣、人聲如沸。這莊子的主人今日做“春日...
    開(kāi)封第一講書(shū)人閱讀 32,699評(píng)論 0 25
  • 文/蒼蘭香墨 我抬頭看了看天上的太陽(yáng)。三九已至戴卜,卻和暖如春逾条,著一層夾襖步出監(jiān)牢的瞬間,已是汗流浹背投剥。 一陣腳步聲響...
    開(kāi)封第一講書(shū)人閱讀 33,814評(píng)論 1 274
  • 我被黑心中介騙來(lái)泰國(guó)打工师脂, 沒(méi)想到剛下飛機(jī)就差點(diǎn)兒被人妖公主榨干…… 1. 我叫王不留,地道東北人江锨。 一個(gè)月前我還...
    沈念sama閱讀 49,299評(píng)論 3 379
  • 正文 我出身青樓吃警,卻偏偏與公主長(zhǎng)得像,于是被迫代替她去往敵國(guó)和親啄育。 傳聞我的和親對(duì)象是個(gè)殘疾皇子酌心,可洞房花燭夜當(dāng)晚...
    茶點(diǎn)故事閱讀 45,870評(píng)論 2 361

推薦閱讀更多精彩內(nèi)容