> 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 tip,

This is problem number one. That's pretty much what happened -- the branch 
("animalAging") was reset, but the documentation ("man git-reset") claims 
something else.

               Does not touch the index file or the working tree at all
               (but resets the head to <commit>, just like all modes do).
               This leaves all your changed files "Changes to be committed",
               as git status would put it.

It reset the head to commit, yes.
It also reset the branch tip pointer.

I found out about the --soft option by asking this list, how do I change where 
a commit will go without altering any of my files -- I've got files on branch 
X, but they should actually go onto master. 

(I am trying very, very hard to follow what seems to be the consistent 
recommendation -- your work branches can and should be messy, but what you put 
onto master should be clean, either by squashing a bunch of commits, or using 
the branches as temporaries for testing purposes.)

> 1. http://git-scm.com/book/en/v2/Git-Tools-Reset-Demystified
> 2. http://threetrees.herokuapp.com/

Thank you.
Entertaining minecraft videos

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