On 2015-05-12, at 7:46 PM, Dale R. Worley <wor...@alum.mit.edu> wrote:
> Michael <keybou...@gmail.com> writes: >> 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??? > > What branch was checked out when you did those two commits? If I read > the output of git-commit correctly, the branch was anamalAging. But the > git-reset changed the checked out branch to master, which of course, did > not show the commits made on another branch. > > Dale That's right. But 'gitk --all' did not show them either. Attempting to checkout the commits by SHA did fetch them, and did show that the branch label for "animalAging" was no longer pointing to the end of the branch. I was able to get the file onto master. I'm just not understanding the git reset -- it seems to not just change the active branch, and possibly the working tree/cached for commit, but also alters where branch label point. That seems to be non-documented, and ... confusing. -- 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.