Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add two post drafts about 'file upload' and 'git'

  • Loading branch information...
commit 6b0a3ce38adaccfc5b28724978f4379e8ddbdd36 1 parent 7759e9c
@reyesyang authored
View
8 _drafts/2014-1-16-ajax-file-upload.md
@@ -0,0 +1,8 @@
+---
+layout: post
+title: Ajax like file upload
+---
+
+**参考**
+
+1. [Ajax file upload with iframe](http://www.alfajango.com/blog/ajax-file-uploads-with-the-iframe-method/)
View
60 _drafts/2014-1-16-git-Q-and-A.md
@@ -0,0 +1,60 @@
+---
+layout: post
+title: Git Q&A
+---
+
+**fetch 和 pull 的区别**
+
+**新建分支**
+
+```bash
+git branch new-branchname
+git checkout new-branchname
+# 等价与
+git checkout -b new-branchname
+```
+
+**删除分支**
+ 删除合并过的分支
+
+```bash
+git branch -d branchname
+```
+
+删除未合并的分支
+
+```bash
+git branch -d -f branchname
+# 等价于
+git branch -D branchname
+```
+
+**--no-ff 的作用**
+
+**何时使用 rebase**
+
+**fetch 别人的分支 git branch 看不到?**
+
+```bash
+git fetch
+git branch -a
+git checkout new-branchname
+```
+
+**5. 如何删除分支?**
+删除本地分支
+
+```bash
+git branch -d branchname
+```
+删除远程分支
+
+```bash
+git push origin :branchname
+```
+
+**参考**
+
+1. [What's the difference between 'git pull' and 'git fetch'](http://stackoverflow.com/questions/292357/whats-the-difference-between-git-pull-and-git-fetch)
+2. [Visual Git Cheat Sheet ](http://ndpsoftware.com/git-cheatsheet.html)
+3. [Heroku Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf)
Please sign in to comment.
Something went wrong with that request. Please try again.