Merge branch 'master' of github.com:PegasusWang/python-web-guide

PegasusWang · PegasusWang · commit 3e5e6093ac0c · 2017-01-10T00:52:57.000+08:00
diff --git a/memo/memo.rst b/memo/memo.rst
@@ -201,7 +201,11 @@ Git
     # 指定文件类型diff
     git diff master -- '*.c' '*.h'
     # 带有上下文的diff
-   j git diff master --no-prefix -U999
+    git diff master --no-prefix -U999
+
+    # undo add
+    git reset <file>
+    git reset    # undo all
 
 
 vim
