On Sun, Aug 10, 2014 at 01:52:11AM +0200, Gergely Polonkai wrote:
> Hello,
> I have a somewhat clean history:
> M1 - M2 - M3*
>                      \ - H1 - H2 - H3*
> M is branch master, H is a topic branch, each of them point to the
> commit marked with the asterisk. Now I want to move master forward
> only one commit (others are not ready for publish, and are subject
> for a big rebase), so master would point to H1. My idea was to use
> git reset --hard H1 on master.  I have used git-reset many times to
> move a branch back in time, but moving forward is a bit strange in
> this situation. Also, I tried git-reset (without --hard) to achieve
> my goal, but it - of course - modified my index, too. I was
> wondering if reset is the correct thing to do in this case?

while you CAN use `git reset --hard` I would suggest you look at `git
merge --ff-only`.


Magnus Therning                      OpenPGP: 0xAB4DFBA4 
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe               http://therning.org/magnus

I invented the term Object-Oriented, and I can tell you I did not have
C++ in mind.
     -- Alan Kay

Attachment: pgp8ZLNmICvPv.pgp
Description: PGP signature

Reply via email to