All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pascal Obry <pascal@obry.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: David Jeske <jeske@willowmail.com>, git@vger.kernel.org
Subject: Re: is rebase the same as merging every commit?
Date: Fri, 27 Jun 2008 08:31:10 +0200	[thread overview]
Message-ID: <4864892E.2060508@obry.net> (raw)
In-Reply-To: <7vzlp7n1j4.fsf@gitster.siamese.dyndns.org>

Junio C Hamano a écrit :
> You would rebase ONLY WHEN the project as the whole (either "other people
> in the project", or "yourself down the road one year from now") is
> interested mostly in the progress of 'master' D-E-F-G, and nobody cares
> whether you developed your A (or B or C) on top of E or G.  So the answer

Or if you are using git-svn as nobody will ever see your local branches. 
So rebasing is just the right way to go when tracking a Subversion tree 
I would say.

Pascal.

-- 

--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|              http://www.obry.net
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595

  parent reply	other threads:[~2008-06-27  8:20 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-26 23:04 is rebase the same as merging every commit? David Jeske
2008-06-27  0:51 ` Junio C Hamano
2008-06-27  1:08   ` Junio C Hamano
2008-06-27  6:24     ` David Jeske
2008-06-27  7:34       ` Matthieu Moy
2008-06-27 15:39         ` David Jeske
2008-06-27 15:39         ` David Jeske
2008-06-27  6:24     ` David Jeske
2008-06-27  6:31   ` Pascal Obry [this message]
2008-06-27 10:33   ` しらいしななこ
2008-06-27 21:51     ` Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2008-06-26 23:04 David Jeske
2008-06-27  6:30 ` Matthieu Moy
2008-06-27  6:46   ` David Jeske
2008-06-27  6:46   ` David Jeske
2008-06-27  8:34   ` Petr Baudis

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=4864892E.2060508@obry.net \
    --to=pascal@obry.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jeske@willowmail.com \
    /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.