LINUX.ORG.RU

Можна ли восстановить файлы после git checkout?

 , ,


0

0

Хотел перенести коммиты в другую (man) ветку и лопухнулся

лог событий

Admin@WORK /G/scripts v2.0/specs (master)
$ gt st
# On branch master
# Your branch is ahead of 'origin/master' by 44 commits.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       deleted:    speed_by_abs_quantified.ajs
#
# 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:   ../lib/core/configuration.ajs
#       modified:   ../lib/core/dispatcher.ajs
#       modified:   ../lib/core/graphic.ajs
#       modified:   ../lib/core/logger.ajs
#       modified:   ../power_sprint.ajs
#       modified:   load.ajs
#       modified:   load2impulse_as_dots.ajs
#       modified:   lpg_injector_impulse_width.ajs
#       modified:   rpm.ajs
#       modified:   rpm2impulse_as_dots.ajs
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       acceleration_by_abs.ajs
Admin@WORK /G/scripts v2.0/specs (master)
$ git branch newbranch
Admin@WORK /G/scripts v2.0/specs (master)
$ gt br
  gvi
* master
  newbranch
Admin@WORK /G/scripts v2.0/specs (master)
$ gt co master
M       lib/core/configuration.ajs
M       lib/core/dispatcher.ajs
M       lib/core/graphic.ajs
M       lib/core/logger.ajs
M       power_sprint.ajs
M       specs/load.ajs
M       specs/load2impulse_as_dots.ajs
M       specs/lpg_injector_impulse_width.ajs
M       specs/rpm.ajs
M       specs/rpm2impulse_as_dots.ajs
D       specs/speed_by_abs_quantified.ajs
Already on 'master'
Your branch is ahead of 'origin/master' by 44 commits.
  (use "git push" to publish your local commits)
Admin@WORK /G/scripts v2.0/specs (master)
$ git reset --hard HEAD~44
HEAD is now at 6e333c4 force 2 impulse dots: full rework and rename
Admin@WORK /G/scripts v2.0/specs (master)
$ gt co newbranch
Switched to branch 'newbranch'
Admin@WORK /G/scripts v2.0/specs (newbranch)
$
Admin@WORK /G/scripts v2.0/specs (newbranch)
$ gt st
# On branch newbranch
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       acceleration_by_abs.ajs
nothing added to commit but untracked files present (use "git add" to track)
Admin@WORK /G/scripts v2.0/specs (newbranch)
$
Admin@WORK /G/scripts v2.0/specs (newbranch)
$
Admin@WORK /G/scripts v2.0/specs (newbranch)
$ gt st
# On branch newbranch
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       acceleration_by_abs.ajs
nothing added to commit but untracked files present (use "git add" to track)
Admin@WORK /G/scripts v2.0/specs (newbranch)
$ gt co master
Switched to branch 'master'
Admin@WORK /G/scripts v2.0/specs (master)
$ gt st
# On branch master
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       acceleration_by_abs.ajs
nothing added to commit but untracked files present (use "git add" to track)
Admin@WORK /G/scripts v2.0/specs (master)
$

PS: env - msysgit@win xp

★★★★★

Последнее исправление: ZuBB (всего исправлений: 1)

отбой. часть осталась в виме, часть диффа в терминале выше. остальное не так важно

ZuBB ★★★★★
() автор топика
Последнее исправление: ZuBB (всего исправлений: 1)
Ответ на: комментарий от ZuBB

А, тогда git stash для таких случаев может быть удобен, но до git reset --hard...

backbone ★★★★★
()
Вы не можете добавлять комментарии в эту тему. Тема перемещена в архив.