git checkout

patch 盛り込みテスツの後、以下な差分が発生。

$ git status
# On branch patchtest
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   drivers/staging/omapdrm/omap_connector.c
#       modified:   drivers/staging/omapdrm/omap_crtc.c
#       modified:   drivers/staging/omapdrm/omap_drv.c
#       modified:   drivers/staging/omapdrm/omap_drv.h
#       modified:   drivers/staging/omapdrm/omap_encoder.c
#       modified:   drivers/staging/omapdrm/omap_fb.c
#       modified:   drivers/staging/omapdrm/omap_gem.c
#       modified:   drivers/staging/omapdrm/omap_gem_dmabuf.c
#       modified:   drivers/staging/omapdrm/omap_gem_helpers.c
#       modified:   drivers/staging/omapdrm/omap_plane.c
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       drivers/staging/omapdrm/Module.symvers
$

もとに戻すの面倒いなぁ、と言いつつ試しに

$ git checkout drivers/staging/omapdrm/

ってヤッてみたら一気にもとに戻りました。知らなんだ。

$ git status
# On branch patchtest
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       drivers/staging/omapdrm/Module.symvers
nothing added to commit but untracked files present (use "git add" to track)
$

わははは。