From: Linus Torvalds <torvalds@linux-foundation.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] Teach 'git pull' the '--rebase' option
Date: Thu, 25 Oct 2007 16:36:24 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.0.999.0710251634200.30120@woody.linux-foundation.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0710260007450.4362@racer.site>
On Fri, 26 Oct 2007, Johannes Schindelin wrote:
>
> \--rebase::
> Instead of a merge, perform a rebase after fetching.
> *NOTE:* Never do this on branches you plan to publish! This
> command will _destroy_ history, and is thus only suitable for
> topic branches to be submitted to another committer.
Well, it really needs explanation of what "destroy" means.
Also, it's not strictly even necessary to publish things for this to cause
problems. It's perfectly sufficient to just do development on two private
developer machines, and do things like keeping the two machines in sync by
pulling things between them manually...
So even "normal" developers who never publish a git tree to others may
actually hit this issue.
Linus
next prev parent reply other threads:[~2007-10-25 23:38 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-25 22:54 [PATCH] Teach 'git pull' the '--rebase' option Johannes Schindelin
2007-10-25 23:04 ` Linus Torvalds
2007-10-25 23:10 ` Johannes Schindelin
2007-10-25 23:36 ` Linus Torvalds [this message]
2007-10-25 23:49 ` Linus Torvalds
2007-10-25 23:54 ` Junio C Hamano
2007-10-26 9:52 ` Johannes Schindelin
2007-11-28 0:11 ` Junio C Hamano
2007-11-28 13:11 ` [PATCH v2] Teach 'git pull' about --rebase Johannes Schindelin
2007-11-28 13:15 ` Jonathan del Strother
2007-11-28 14:02 ` Johannes Schindelin
2007-11-28 13:19 ` Jakub Narebski
2007-11-28 20:35 ` Steven Grimm
2007-11-28 20:40 ` Johannes Schindelin
2007-11-28 21:10 ` Lars Hjemli
2007-11-28 21:55 ` Junio C Hamano
2007-11-28 21:58 ` Johannes Schindelin
2007-11-28 22:06 ` Steven Grimm
2007-11-28 22:33 ` J. Bruce Fields
2007-11-28 22:47 ` J. Bruce Fields
2007-11-28 23:12 ` Johannes Schindelin
2007-11-28 23:32 ` Junio C Hamano
2007-11-28 23:56 ` J. Bruce Fields
2007-11-29 0:16 ` Johannes Schindelin
2007-11-29 8:36 ` Andreas Ericsson
2007-11-29 3:23 ` Nicolas Pitre
2007-11-28 21:59 ` Jon Loeliger
2007-11-28 22:02 ` Johannes Schindelin
2007-12-01 20:37 ` Björn Steinbrink
2007-12-03 13:10 ` Karl Hasselström
2007-10-26 11:43 ` [PATCH] Teach 'git pull' the '--rebase' option Jeff King
2007-10-26 11:45 ` Jeff King
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=alpine.LFD.0.999.0710251634200.30120@woody.linux-foundation.org \
--to=torvalds@linux-foundation.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).