## GIT常用执令说明

 *   初始化git项目

 >   git init

 *   查看当前目录状态

 >   git status

 *   把代码提交到stage区

 >   git add file.txt

 >   git add .

 *   从stage区提交代码到仓库

 > git commit -m "说明"

 *   查看commit日志

 >   git log

 >   git log --pretty=oneline

 *   查看提交，回滚所有操作

 >   git reflog

 *   回滚到上一个版本

 >   git reset --hard HEAD^

 *   回滚到上二个版本

 >   git reset --hard HEAD^^

 *   回滚到指定版本

 >   git reset --hard afa3kf

 *   删除文件

 >   git rm file.txt

 >   git commit -m "del file.txt"

 *   从stage区删除

 >   git add test.txt

 >   git reset test.txt

 *   文件放弃修改

 >   git checkout -- file.txt

 *   增加远程GIT

 >   git remote add origin https://github.com/willianflasky/s16day21.git

 ####    关联GITHUB

 ==本地无项目文件==

 ```

 echo "# mysite" >> README.md

 git init

 git add README.md

 git commit -m "first commit"

 git remote add origin git@github.com:willianflasky/mysite.git

 git push -u origin master

 ```

 ==本地有项目文件==

 ```

 git remote add origin git@github.com:willianflasky/mysite.git

 git push -u origin master

 ```

 #### 备注

     1.两种方式：https and git

     2.本地生成公钥添加到GITHUB

 *   .gitignore

 >   https://github.com/github/gitignore

 *   保存工作区临时地方

 >   git stash   

 >   git stash list

 >   git stash apply

 >   git stash drop

 >   git stash pop

 *   分支

 ```

 git branch dev          #创建分支

 git checkout dev        #切换到dev分支

 git checkout -b dev     #切换到dev分支，如果没有这个分支则创建

 git pull origin master  #换取远程master主干代码

 git merge dev           #将当前分支合并dev分支

 ```

 #### ==合并分支套路==

 ```

     1.git checkout master       #切换到master

     2.git pull                  #拉取远程最新master代码

     3.git merge dev             #在master分支上合并dev分支

     4.push push origin master   #把合并后的代码push到远程master

 ```

 - proj/

   - proj/__init__.py

   - proj/settings.py

   - proj/urls.py

 - manage.py

 from __future__ import absolute_import, unicode_literals

 import os

 from celery import Celery

 # set the default Django settings module for the 'celery' program.

 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'proj.settings')

 app = Celery('proj')

 # Using a string here means the worker don't have to serialize

 # the configuration object to child processes.

 # - namespace='CELERY' means all celery-related configuration keys

 #   should have a `CELERY_` prefix.

 app.config_from_object('django.conf:settings', namespace='CELERY')

 # Load task modules from all registered Django app configs.

 app.autodiscover_tasks()

 @app.task(bind=True)

 def debug_task(self):

     print('Request: {0!r}'.format(self.request))

 from __future__ import absolute_import, unicode_literals

 # This will make sure the app is always imported when

 # Django starts so that shared_task will use this app.

 from .celery import app as celery_app

 __all__ = ['celery_app']

 - app1/

     - tasks.py

     - models.py

 - app2/

     - tasks.py

     - models.py

 # Create your tasks here

 from __future__ import absolute_import, unicode_literals

 from celery import shared_task

 @shared_task

 def add(x, y):

     return x + y

 @shared_task

 def mul(x, y):

     return x * y

 @shared_task

 def xsum(numbers):

     return sum(numbers)

 from django.shortcuts import render,HttpResponse

 # Create your views here.

 from  bernard import tasks

 def task_test(request):

     res = tasks.add.delay(228,24)

     print("start running task")

     print("async task res",res.get() )

     return HttpResponse('res %s'%res.get())