Hi,
a question for git-ers:
- just messed up too much with git reset --soft HEAD^
- apparently, I rolled back some work, and I don't have it in my file system
any more
- however, I can see the interesting patch still is stored some way into
HEAD@{27}, but when I git-show it, I can see all things marked with double ++
and -- (or space +, space -)
- if I try to pick that patch with cherry-pick, it refuses
$ git cherry-pick 2db35095
error: Commit 2db35095d3c1ac47d9181dcc178c3e9238953b1a is a merge but no -m
option was given.
fatal: cherry-pick failed
is there a way I can still recover that patch from git ? Or, should I resign to
"copy" manually the changes that I can see with show view HEAD@{27} ?
Thx,
T.
