diff --git a/Git学习笔记--马俊.xmind b/Git学习笔记--马俊.xmind
new file mode 100644
index 0000000..df0aedf
Binary files /dev/null and b/Git学习笔记--马俊.xmind differ
diff --git a/Git学习笔记姚建婷.docx b/Git学习笔记姚建婷.docx
new file mode 100644
index 0000000..e931c3d
Binary files /dev/null and b/Git学习笔记姚建婷.docx differ
diff --git a/dhy.txt b/dhy.txt
index e69de29..19f4731 100644
--- a/dhy.txt
+++ b/dhy.txt
@@ -0,0 +1,13 @@
+git checkout dhy -- aaa.txt 强制合并dhy中的aaa.txt文件
+git diff dev dhy -- aaa.txt
+git merge dhy --no-edit  不需要每次合并都编辑
+
+
+git branch --set-upstream-to=origin/dev dev
+	作用： 将dev本地分支设置为跟踪远程分支 origin/dev。
+	适用场景： 当你当前不在dev 分支，只需要设置它的跟踪关系时。
+
+git branch --set-upstream-to=origin/dev
+	作用： 将当前所在的本地分支设置为跟踪远程分支 origin/dev。
+	适用场景： 当你当前 已经切换到 dev 分支，只需要设置它的跟踪关系时。
+git branch里面有 master 没有dev 所以需要让本地dev和远程dev关联上：git branch --set-upstream-to=origin/dev dev 然后 再 git push
\ No newline at end of file
diff --git a/~$git学习文档 - 副本.doc b/~$git学习文档 - 副本.doc
new file mode 100644
index 0000000..fcd42e3
Binary files /dev/null and b/~$git学习文档 - 副本.doc differ
diff --git a/李继坤Git自学.doc b/李继坤Git自学.doc
new file mode 100644
index 0000000..219b1db
Binary files /dev/null and b/李继坤Git自学.doc differ
diff --git a/李继坤_超级云脑学习.doc b/李继坤_超级云脑学习.doc
new file mode 100644
index 0000000..a2edfd0
Binary files /dev/null and b/李继坤_超级云脑学习.doc differ
diff --git a/赵文康Git学习文档.docx b/赵文康Git学习文档.docx
new file mode 100644
index 0000000..723db9c
Binary files /dev/null and b/赵文康Git学习文档.docx differ