Git development
 help / color / mirror / Atom feed
From: "Philip Oakley" <philipoakley@iee.org>
To: "Felipe Contreras" <felipe.contreras@gmail.com>
Cc: <git@vger.kernel.org>
Subject: Re: [RFC] New kind of upstream branch: base branch
Date: Thu, 16 May 2013 20:35:26 +0100	[thread overview]
Message-ID: <D6098E29305740EE916958521A797AB9@PhilipOakley> (raw)
In-Reply-To: CAMP44s13Q6DMX+QNteqO8D-J7bDcNyp7OkRVqj6B1Qhp0OSB+Q@mail.gmail.com

From: "Felipe Contreras" <felipe.contreras@gmail.com>
Sent: Thursday, May 16, 2013 4:46 AM
> On Wed, May 15, 2013 at 5:22 PM, Philip Oakley <philipoakley@iee.org> 
> wrote:
>
>> Sound a reasonable idea. On some patches I was working on I had to 
>> [chose
>> to] add a tag for the base which made it easier to rebase later.
>
> And was the 'upstream' branch somehow not appropriate for some reason?

If I remember correctly, I had a short branch based on 'pu', which was 
rewound, so I wanted to rebase that short branch onto the new 'pu'. This 
creates a confusion between old-pu and new-pu. Having a marker for the 
'base' at the branch point allowed an easy specification of the branch

I think I misunderstood your proposal. I thought that it would 
effectively save a marker (e.g. the sha1) for the base point of the 
branch, it may have been something similar to a [lightweight] tag, it 
could have been just local or could have been transferable, I hadn't 
thought it further.

Philip 

  reply	other threads:[~2013-05-16 19:35 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-15 20:34 [RFC] New kind of upstream branch: base branch Felipe Contreras
2013-05-15 22:22 ` Philip Oakley
2013-05-16  3:46   ` Felipe Contreras
2013-05-16 19:35     ` Philip Oakley [this message]
2013-05-17  0:07       ` Felipe Contreras
2013-05-17 19:20 ` Kevin Bracey
2013-05-17 19:51   ` Junio C Hamano
2013-05-17 20:15     ` Felipe Contreras
2013-05-18 14:29     ` Kevin Bracey
2013-05-18 18:14       ` Ramkumar Ramachandra
2013-05-18 22:42       ` Felipe Contreras
2013-05-19  6:22       ` Junio C Hamano
2013-05-19  8:12         ` Felipe Contreras
2013-05-17 20:01   ` Felipe Contreras
  -- strict thread matches above, loose matches on Subject: below --
2013-05-15 20:28 Felipe Contreras
2013-05-15 22:20 ` Junio C Hamano
2013-05-15 22:50   ` Junio C Hamano
2013-05-15 23:18     ` Felipe Contreras
2013-05-15 22:56   ` Felipe Contreras
2013-05-15 23:14     ` Junio C Hamano
2013-05-15 23:32       ` Felipe Contreras

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=D6098E29305740EE916958521A797AB9@PhilipOakley \
    --to=philipoakley@iee.org \
    --cc=felipe.contreras@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox