All of lore.kernel.org
 help / color / mirror / Atom feed
From: Seb <spluque@gmail.com>
To: git@vger.kernel.org
Subject: Re: interactive rebase results across shared histories
Date: Tue, 23 Feb 2016 11:39:25 -0600	[thread overview]
Message-ID: <87io1f5nsi.fsf@gmail.com> (raw)
In-Reply-To: 56C91D21.90306@moritzneeb.de

On Sun, 21 Feb 2016 03:12:49 +0100,
Moritz Neeb <lists@moritzneeb.de> wrote:

> Hi Seb,
> On 02/20/2016 11:58 PM, Seb wrote:
>> Hello,

>> I've recently learnt how to consolidate and clean up the master
>> branch's commit history.  I've squashed/fixuped many commits thinking
>> these would propagate to the children branches with whom it shares
>> the earlier parts of the its history.  However, this is not the case;
>> switching to the child branch still shows the non-rebased (dirty)
>> commit history from master.  Am I misunderstanding something with
>> this?

> I am not sure what you meand by "child branch". If I understand
> corretly, you have something like:

[...]

> Maybe, to get a better understanding, you could use visualization tool
> like "tig" or "gitk" to observe what happens to your commits (hashes)
> and branches (labels) and just play around with some of these
> operations.

OK, I've followed this advice and looked at the dependency graphs in
gitk before and after rebasing, I've managed to obtain what I was
after.  The repository now has two branches: master and topic.  However,
Gitk reveals a problem with a string of commits that are not part of any
branch:

A---B---H---I                   (master)
     \
      C---D---E                 (loose string of commits)
       \
        D'---E'---F---G         (topic)

How do I remove these loose commits (C, D, E)?

Thanks for your feedback,

-- 
Seb

  parent reply	other threads:[~2016-02-23 17:40 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-20 22:58 interactive rebase results across shared histories Seb
2016-02-21  2:12 ` Moritz Neeb
2016-02-21 17:25   ` Seb
2016-02-21 19:08     ` Eric Sunshine
2016-02-22  3:32       ` Seb
2016-02-22  7:41   ` David
2016-02-23 17:39   ` Seb [this message]
2016-02-23 22:57     ` Moritz Neeb
2016-02-23 23:04       ` Kevin Daudt
2016-02-23 23:05       ` Seb
2016-02-26 12:38         ` David
2016-02-26 21:12           ` Seb
2016-02-26 22:56             ` Stepan Kasal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87io1f5nsi.fsf@gmail.com \
    --to=spluque@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.