On Sep 16, 3:11 pm, "Michael P. Soulier" <msoul...@digitaltorque.ca>
wrote:

>> I forgot to mention the work branch is based on master. It is one or
>> more commits ahead. I only  want to move the master head to the work
>> head.
> That's what merge is for. Why would you use reset?

Also I should note that Git is smart about merging and in case master
did not contain any commits beyond the point work was forked off it
Git will perform the so-called "fast-forwarding" of the master branch
by making its tip point to the tip commit in work -- the same thing
which would result from doing `git reset --hard work`.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to