From: merlyn@stonehenge.com (Randal L. Schwartz)
To: Peter Krefting <peter@softwolves.pp.se>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: git pull --rebase and losing commits
Date: Mon, 02 Nov 2009 20:27:33 -0800 [thread overview]
Message-ID: <86my3444i2.fsf@blue.stonehenge.com> (raw)
In-Reply-To: <alpine.DEB.2.00.0911021318400.3919@ds9.cixit.se> (Peter Krefting's message of "Mon, 2 Nov 2009 13:26:37 +0100 (CET)")
>>>>> "Peter" == Peter Krefting <peter@softwolves.pp.se> writes:
Peter> git pull --rebase --strategy=ours origin master
"No good can come of this."
--
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Smalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc.
See http://methodsandmessages.vox.com/ for Smalltalk and Seaside discussion
prev parent reply other threads:[~2009-11-03 4:27 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-02 12:26 git pull --rebase and losing commits Peter Krefting
2009-11-02 15:04 ` Thomas Rast
2009-11-02 21:34 ` Nanako Shiraishi
2009-11-02 15:10 ` Björn Steinbrink
2009-11-03 7:01 ` Peter Krefting
2009-11-03 9:52 ` Johannes Schindelin
2009-11-03 10:12 ` Peter Krefting
2009-11-11 14:03 ` [PATCH] Clarify documentation on the "ours" merge strategy Peter Krefting
2009-11-11 15:13 ` Baz
2009-11-11 20:35 ` Thomas Rast
2009-11-11 20:54 ` Baz
2009-11-11 21:02 ` Junio C Hamano
2009-11-11 21:30 ` [PATCH] " Nicolas Sebrecht
2009-11-11 23:37 ` Thomas Rast
2009-11-12 7:55 ` Junio C Hamano
2009-11-12 9:41 ` Peter Krefting
2009-11-14 2:12 ` Nanako Shiraishi
2009-11-15 9:10 ` Junio C Hamano
2009-11-16 8:20 ` Peter Krefting
2009-11-12 9:55 ` Björn Steinbrink
2009-11-15 18:25 ` [PATCH 0/3] Document and refuse rebase -s ours Thomas Rast
2009-11-15 18:25 ` [PATCH 1/3] Documentation: clarify 'ours' merge strategy Thomas Rast
2009-11-15 18:25 ` [PATCH 2/3] rebase docs: clarify --merge and --strategy Thomas Rast
2009-11-15 21:05 ` Junio C Hamano
2009-11-15 21:11 ` Thomas Rast
2009-11-15 18:25 ` [PATCH 3/3] rebase: refuse to rebase with -s ours Thomas Rast
2009-11-15 18:39 ` Sverre Rabbelier
2009-11-15 18:44 ` Thomas Rast
2009-11-16 12:35 ` Johannes Schindelin
2009-11-16 19:57 ` Junio C Hamano
2009-11-16 21:25 ` Johannes Schindelin
2009-11-16 21:45 ` Junio C Hamano
2009-11-16 22:04 ` Sverre Rabbelier
2009-11-16 23:04 ` A Large Angry SCM
2009-11-15 21:04 ` [PATCH 0/3] Document and refuse rebase " Junio C Hamano
2009-11-15 21:13 ` Thomas Rast
2009-11-03 10:12 ` git pull --rebase and losing commits Thomas Rast
2009-11-03 4:27 ` Randal L. Schwartz [this message]
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=86my3444i2.fsf@blue.stonehenge.com \
--to=merlyn@stonehenge.com \
--cc=git@vger.kernel.org \
--cc=peter@softwolves.pp.se \
/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.