git reflog
对比
from django.db import models
class UserInfo(models.Model):
uname = models.CharField(max_length=20)
upwd = models.CharField(max_length=40)
git diff HEAD -- 文件名
例:
git diff HEAD -- df_user/models.py
git add df_user/models.py
git commit -m '删除模型类的str方法'
from django.db import models
class UserInfo(models.Model):
uname = models.CharField(max_length=20)
upwd = models.CharField(max_length=40)
def __str__(self):
return "%s" % self.uname
git add df_user/models.py
git commit -m '修改模型类的str方法为name属性'
git diff HEAD HEAD^^ -- df_user/models.py
回退
git add df_user/models.py
git commit -m '修改模型类'
git status
git reset HEAD^或版本号
例:
git reset HEAD^
git status
git checkout -- df_user/models.py
git rm 文件名
git commit -m '说明信息'
if __name__=='__main__':
print 'test a'
git add df_user/a.py
git commit -m '创建文件a'
git rm df_user/a.py
git commit -m '删除文件a'