I'm having trouble with git reset. It's not doing what I thought it would do. 
And, it seems to be throwing away data, which I thought git never did.

Here's what I was doing. At the start, I had a test config file in the working 
directory and index.
It is "good enough", and the config file got an update from an updated program 
while running.


keybounceMBP:config michael$ git commit -m "First test"
[animalAging 0653a0b] First test
 1 file changed, 140 insertions(+)
 create mode 100644 HarderWildlife.cfg
keybounceMBP:config michael$ gitk --all
^C
keybounceMBP:config michael$ git commit HarderWildlife.cfg -m "Works good 
enough. Mod updated."
[animalAging 3d5c944] Works good enough. Mod updated.
 1 file changed, 20 insertions(+), 2 deletions(-)

## At this point, I have committed my first edits, from the index, verified 
that it was in,
## and then committed the final file, with the additions from the new version 
of the program.

keybounceMBP:config michael$ git reset --soft master

## I am trying to take this config file, as-is, to put into master, to keep the 
master branch
## clean (while using the topic branch for development work)

keybounceMBP:config michael$ gitk --all

## But ... my last two commits do not show up at all???


keybounceMBP:config michael$ git log
commit a22ce2b6d53919f926669a71b389446c3f523c6f
Author: Keybounce <michael-git...@stb04.nccom.com>
Date:   Fri May 8 20:19:06 2015 -0700

    bare

commit 387222fbd7ea7a9eea8ea656e9e5d88173cc9d3a
Author: Keybounce <michael-git...@stb04.nccom.com>
Date:   Fri May 8 20:18:55 2015 -0700

    start
keybounceMBP:config michael$ 

The two commits -- 0653a0b and 3d5c944 -- cannot be found??

---
Entertaining minecraft videos
http://YouTube.com/keybounce

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to