Re: [git-users] Help with git reset, please.

2015-05-13 Thread Dale R. Worley
Michael writes: >> those two sentences say the same thing. HEAD *is* "the branch tip pointer", >> unless it's detached. > > Alright, maybe this is my first point of confusion. > > I thought "HEAD" is where you are at -- which of those letters you are > pointing to. > And, it may also be where a b

Re: [git-users] Help with git reset, please.

2015-05-13 Thread Konstantin Khomoutov
On Wed, 13 May 2015 08:29:39 -0700 Michael wrote: [...] > Alright, maybe this is my first point of confusion. > > I thought "HEAD" is where you are at -- which of those letters you > are pointing to. And, it may also be where a branch tip is pointing. > > If I make a commit while on a branch,

Re: [git-users] Help with git reset, please.

2015-05-13 Thread Michael
On 2015-05-13, at 7:54 AM, Roman Neuhauser wrote: > # keybou...@gmail.com / 2015-05-13 07:37:34 -0700: >>> These modes are selected by a special command line option: --soft, >>> --hard or --mixed, with the latter being the default. >>> >>> The --soft option only repositions the branch's tip, >>

Re: [git-users] Help with git reset, please.

2015-05-13 Thread Roman Neuhauser
# keybou...@gmail.com / 2015-05-13 07:37:34 -0700: > > These modes are selected by a special command line option: --soft, > > --hard or --mixed, with the latter being the default. > > > > The --soft option only repositions the branch's tip, > > This is problem number one. That's pretty much wh

Re: [git-users] Help with git reset, please.

2015-05-13 Thread Michael
> > Well, `git reset` is completely documented in its manual page > (try running `git help reset`). I did. But ... > These modes are selected by a special command line option: --soft, > --hard or --mixed, with the latter being the default. > > The --soft option only repositions the branch's

Re: [git-users] Help with git reset, please.

2015-05-13 Thread Konstantin Khomoutov
On Tue, 12 May 2015 20:34:01 -0700 Michael wrote: [...] > 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 ... confusi

Re: [git-users] Help with git reset, please.

2015-05-12 Thread Michael
On 2015-05-12, at 7:46 PM, Dale R. Worley wrote: > Michael 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 >> key

Re: [git-users] Help with git reset, please.

2015-05-12 Thread Dale R. Worley
Michael 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

[git-users] Help with git reset, please.

2015-05-12 Thread Michael
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