From: "Stephen J. Turnbull" <stephen@xemacs.org>
To: Ken Raeburn <raeburn@raeburn.org>
Cc: Andreas Schwab <schwab@linux-m68k.org>,
Emacs Development <emacs-devel@gnu.org>
Subject: Re: Bazaar migration status?
Date: Thu, 23 Jul 2009 12:49:06 +0900 [thread overview]
Message-ID: <871vo8vz2l.fsf@uwakimon.sk.tsukuba.ac.jp> (raw)
In-Reply-To: <4F76137C-0F9C-4181-8C02-F47C0180A9E3@raeburn.org>
Ken Raeburn writes:
> The advice I've seen isn't "don't do it too often", it's "don't do
> it".
Rebase a copy of the branch instead of the original, if it worries you
so much:
git checkout -b rebased-branch original-branch
git rebase master
If you're worried about this, but have no control over the main repo,
there's always
# proof of concept; may fail spectacularly if you have defaults
# configured
git-my-pull () { git branch save-branch; git pull $@; }
Advocacy:
True, you will see "don't ever rebase" a lot from git-phobes. It
should be considered to be a litmus test for git-phobia, not as
reflecting VCS reality.
In fact, rebasing is such an important operation that *all* of the
dVCSes have been forced by user demand to provide it, and *only git*
provides facilities (ie, the reflog) for recovery from an ill-advised
rebase that can be used by newbies.[1] AFAIK, all of hg, bzr, and
darcs can *destroy* some DAG data basically irrecoverably, while git
*always* preserves it (until the next git-gc --prune, which by default
is so far in the future that it's of the same order of magnitude as an
Emacs release cycle ... uh, well, I exaggerate, but you get the
point).
Git-advocate-who-has-helped-advise-two-transitions-to-hg-ly y'rs,
Footnotes:
[1] Admittedly, untangling a git-rebase is not for wilting violet
newbies, but anybody who has learned to accept dying in Nethack should
be able to handle it -- it's exactly the same experience: you didn't
want it to happen, it will take time and effort to get back to where
you were, but no permanent harm is ever done.
next prev parent reply other threads:[~2009-07-23 3:49 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-17 12:41 Bazaar migration status? joakim
2009-07-17 15:50 ` Stefan Monnier
2009-07-17 17:06 ` joakim
2009-07-17 17:56 ` Stefan Monnier
2009-07-19 22:55 ` Daniel Clemente
2009-07-29 16:43 ` Karl Fogel
2009-07-17 18:37 ` Chong Yidong
2009-07-19 6:50 ` Karl Fogel
2009-07-19 9:35 ` joakim
2009-07-19 10:27 ` Ken Raeburn
2009-07-20 13:35 ` Stefan Monnier
2009-07-20 13:55 ` David Reitter
2009-07-20 17:58 ` Stefan Monnier
2009-07-20 22:16 ` Miles Bader
2009-07-21 0:54 ` Stefan Monnier
2009-07-21 8:19 ` Andreas Schwab
2009-07-21 23:31 ` Ken Raeburn
2009-07-22 7:19 ` David Reitter
2009-07-22 21:33 ` Andreas Schwab
2009-07-22 23:46 ` Ken Raeburn
2009-07-23 3:49 ` Stephen J. Turnbull [this message]
2009-07-23 5:13 ` Miles Bader
2009-07-23 5:34 ` Ken Raeburn
2009-07-23 8:14 ` Stephen J. Turnbull
2009-07-23 22:06 ` Ken Raeburn
2009-07-24 2:43 ` Stephen J. Turnbull
2009-07-24 8:45 ` Ken Raeburn
2009-07-24 11:13 ` Stephen J. Turnbull
2009-07-23 7:53 ` Andreas Schwab
2009-07-20 22:14 ` Christian Faulhammer
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871vo8vz2l.fsf@uwakimon.sk.tsukuba.ac.jp \
--to=stephen@xemacs.org \
--cc=emacs-devel@gnu.org \
--cc=raeburn@raeburn.org \
--cc=schwab@linux-m68k.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).