From: Jonathan Nieder <jrnieder@gmail.com>
To: Eugene Sajine <euguess@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Why the default action for pull is merge, but not rebase?
Date: Wed, 27 Oct 2010 11:57:24 -0500 [thread overview]
Message-ID: <20101027165723.GC11069@burratino> (raw)
In-Reply-To: <AANLkTinLbaE6He-bxA_+CT6J5uWmZSgodGs6SXO7eqnr@mail.gmail.com>
Eugene Sajine wrote:
> So, why not to rebase?
An interesting question.
Rebasing results in untested commits. If this is a patch series
for submission, that's fine, because you will be extensively
testing each patch anyway or indicating to reviewers that that
needs to be done (right?). But if it's a long-lived branch then
such repeated testing work can be a serious hassle.
https://git.wiki.kernel.org/index.php/GitFaq#What_is_the_difference_between_a_merge_and_a_rebase.3F
A public branch that is regularly rebased is hard to follow
("git log foo@{1}..foo") and build on.
http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html#_recovering_from_upstream_rebase
Code consumers often want clean history, but that really means
(a) clean and (b) history.
http://thread.gmane.org/gmane.comp.video.dri.devel/34739/focus=34744
Hope that helps.
next prev parent reply other threads:[~2010-10-27 16:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-27 16:46 Why the default action for pull is merge, but not rebase? Eugene Sajine
2010-10-27 16:57 ` Jonathan Nieder [this message]
2010-10-27 17:21 ` Eugene Sajine
2010-10-27 17:36 ` Jonathan Nieder
[not found] ` <0016e645b8c87a160804939cdc5e@google.com>
2010-10-27 17:58 ` Eugene Sajine
2010-10-27 18:05 ` Jonathan Nieder
2010-10-27 19:30 ` Eric Raible
2010-10-28 2:53 ` Joshua Jensen
2010-10-28 3:27 ` Kevin Ballard
2010-10-28 6:39 ` Eric Raible
2010-10-28 7:13 ` Kevin Ballard
2010-10-28 7:27 ` Stefan Haller
2010-10-28 6:17 ` Björn Steinbrink
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=20101027165723.GC11069@burratino \
--to=jrnieder@gmail.com \
--cc=euguess@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.