git获取 bitbucket 项目

copy到当前文件夹下：

git clone https://youname@bitbucket.org/yourname/myrepo.git
git clone https://你的名字@bitbucket.org/项目名称.git 然后根据提示输入密码即可

Cloning into '项目'...

remote: Counting objects: 233, done.

remote: Compressing objects: 100% (190/190), done.

remote: Total 233 (delta 104), reused 0 (delta 0)

Receiving objects: 100% (233/233), 69.09 KiB | 7.00 KiB/s, done.

Resolving deltas: 100% (104/104), done.

Checking connectivity... done.

增加一个文件

git add readme.txt 

增加注释

git commit -m "add readme.txt test"

上传

git push -u origin master

Counting objects: 4, done.

Delta compression using up to 4 threads.

Compressing objects: 100% (3/3), done.

Writing objects: 100% (3/3), 392 bytes | 0 bytes/s, done.

Total 3 (delta 1), reused 0 (delta 0)

To https://你的名字@bitbucket.org/项目名称.git
   8aea84e..b2d5382  master -> master

Branch master set up to track remote branch master from origin.

============================================================================================================

更新代码：git  pull

goodbyedealer git:(master)git pull

remote: Counting objects: 14, done.

remote: Compressing objects: 100% (12/12), done.

remote: Total 14 (delta 3), reused 0 (delta 0)

Unpacking objects: 100% (14/14), done.

增加文件夹：  git  add  －A    XXX/

views git:(master)✗git
add -A waterfall/

增加注释： git  commit  -m  "add XXX"

 viewsgit:(master)✗git
commit -m "add waterfall"

[master 2f8f8f8] add waterfall

提交代码： git  push  origin  master

views git:(master)git push origin master

Counting objects: 64, done.

Delta compression using up to 4 threads.

Compressing objects: 100% (58/58), done.

Writing objects: 100% (61/61), 151.87 KiB | 0 bytes/s, done.

Total 61 (delta 18), reused 0 (delta 0)

全过程：

修改文件后，如何提交到git服务器？

(1)首先需要add，比如.config是被修改的文件，则

 git add .config

(2)然后执行git commit -m "modify .config for some reason"

(3)然后git push 到git服务器

(4)更新：git pull

(5)查看log：git log

当有冲突时做法：

git stash
git pull
git stash pop

注意：如果是在不同文件夹下修改N个文件，不需要对每个文件都git  add操作，只需要在文件夹最外层，

进行git  add  XXX/   就行了