From: sean <seanlkml@sympatico.ca>
To: Andreas Ericsson <ae@op5.se>
Cc: paul@clubi.ie, git@vger.kernel.org
Subject: Re: git-reset and clones
Date: Thu, 16 Mar 2006 10:21:45 -0500 [thread overview]
Message-ID: <BAYC1-PASMTP0354DF2E1D7C62E86C43D9AEE70@CEZ.ICE> (raw)
Message-ID: <20060316102145.35294eed.seanlkml@sympatico.ca> (raw)
In-Reply-To: <44197C04.5080400@op5.se>
On Thu, 16 Mar 2006 15:53:56 +0100
Andreas Ericsson <ae@op5.se> wrote:
> In mothership-repo:
> git checkout master
> git branch next-master ORIGIN
> git rebase next-master; # fix conflicts and commit
> git branch -d master
> git checkout -b master next-master
> git -d next-master
> git revert (the bad commits)
Downstream repos may still be broken afterward though; not much
you can do about that unfortunately.
Sean
next prev parent reply other threads:[~2006-03-16 15:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-16 14:34 git-reset and clones Paul Jakma
[not found] ` <20060316095213.2a8f650a.seanlkml@sympatico.ca>
2006-03-16 14:52 ` sean
2006-03-16 15:48 ` Paul Jakma
2006-03-16 14:53 ` Andreas Ericsson
2006-03-16 14:59 ` Andreas Ericsson
[not found] ` <20060316102145.35294eed.seanlkml@sympatico.ca>
2006-03-16 15:21 ` sean [this message]
2006-03-17 2:10 ` Junio C Hamano
2006-03-17 19:19 ` Jon Loeliger
2006-03-17 20:39 ` Junio C Hamano
2006-03-17 21:00 ` Jon Loeliger
2006-03-17 21:21 ` Andreas Ericsson
2006-03-19 21:40 ` 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=BAYC1-PASMTP0354DF2E1D7C62E86C43D9AEE70@CEZ.ICE \
--to=seanlkml@sympatico.ca \
--cc=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=paul@clubi.ie \
/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).