Re: interactive rebase results across shared histories

2016-02-26 Thread Stepan Kasal
Hello Seb, let me add a few things, perhaps they'll clean some misunderstandings. On Fri, Feb 26, 2016 at 03:12:46PM -0600, Seb wrote: > After cleaning up all the mess, I've ended up with a long master branch, > and a series of earlier commits that are not reachable from master. > Fortunately, th

Re: interactive rebase results across shared histories

2016-02-26 Thread Seb
On Fri, 26 Feb 2016 23:38:38 +1100, David wrote: > On 24 February 2016 at 10:05, Seb wrote: >> On Tue, 23 Feb 2016 23:57:06 +0100, >> Moritz Neeb wrote: >> [...] OK, I've followed this advice and looked at the dependency graphs in gitk before and after rebasing, I've managed to obta

Re: interactive rebase results across shared histories

2016-02-26 Thread David
On 24 February 2016 at 10:05, Seb wrote: > On Tue, 23 Feb 2016 23:57:06 +0100, > Moritz Neeb wrote: > > [...] > >>> 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 bra

Re: interactive rebase results across shared histories

2016-02-23 Thread Seb
On Tue, 23 Feb 2016 23:57:06 +0100, Moritz Neeb wrote: [...] >> 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 p

Re: interactive rebase results across shared histories

2016-02-23 Thread Kevin Daudt
On Tue, Feb 23, 2016 at 11:57:06PM +0100, Moritz Neeb wrote: > On 02/23/2016 06:39 PM, Seb wrote: > > On Sun, 21 Feb 2016 03:12:49 +0100, > > Moritz Neeb wrote: > > > >> Hi Seb, > >> On 02/20/2016 11:58 PM, Seb wrote: > >>> Hello, > > > >>> I've recently learnt how to consolidate and clean up th

Re: interactive rebase results across shared histories

2016-02-23 Thread Moritz Neeb
On 02/23/2016 06:39 PM, Seb wrote: > On Sun, 21 Feb 2016 03:12:49 +0100, > Moritz Neeb 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 think

Re: interactive rebase results across shared histories

2016-02-23 Thread Seb
On Sun, 21 Feb 2016 03:12:49 +0100, Moritz Neeb 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 bra

Re: interactive rebase results across shared histories

2016-02-21 Thread David
On 21 February 2016 at 13:12, Moritz Neeb wrote: > > On 02/20/2016 11:58 PM, Seb wrote: >> >> 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 shar

Re: interactive rebase results across shared histories

2016-02-21 Thread Seb
On Sun, 21 Feb 2016 14:08:44 -0500, Eric Sunshine wrote: [...] > What you're probably missing is that you can't actually edit commits > in Git. Instead, what you think of as "editing" actually creates a new > commit with its own commit-ID, and the original commit still exists > with its own comm

Re: interactive rebase results across shared histories

2016-02-21 Thread Eric Sunshine
On Sun, Feb 21, 2016 at 12:25 PM, Seb wrote: > The scenario is much simpler; imagine master has a longer history behind > the point where the topic branch started: > > A---B---C topic >/ > *---D---E---F---G master > > And we want to keep both branches separate (no

Re: interactive rebase results across shared histories

2016-02-21 Thread Seb
On Sun, 21 Feb 2016 03:12:49 +0100, Moritz Neeb 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 bra

Re: interactive rebase results across shared histories

2016-02-20 Thread Moritz Neeb
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 histo

interactive rebase results across shared histories

2016-02-20 Thread Seb
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 chi