# 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 what happened -- the
> branch ("animalAging") was reset, but the documentation ("man
> git-reset") claims something else.
>            --soft
>                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.

i don't see any disagreement there.

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

those two sentences say the same thing.  HEAD *is* "the branch tip pointer",
unless it's detached.

> 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. 

that depends on your topology.  let's say you've got master at C,
topic at F:

  A -- B -- C
              D -- F

% git checkout master

% git merge --ff-only topic
# OR
% git reset --hard topic

if this is your topology:

  A -- B -- C
          D -- F

% git checkout topic
% git rebase master

that will give you the above, linear topology and you can apply the
same commands.

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