From: Mike Frysinger <vapier@gentoo.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] Attn Maintainers: git advise needed (how to fix messed up repo)
Date: Mon, 28 Nov 2011 18:13:03 -0500 [thread overview]
Message-ID: <201111281813.04391.vapier@gentoo.org> (raw)
In-Reply-To: <CALButCJ7m5D0jaKNNr4pu03uqt7hv0F3LWXH28bOCiMrHfb1tg@mail.gmail.com>
On Monday 28 November 2011 18:05:00 Graeme Russ wrote:
> On Tue, Nov 29, 2011 at 10:02 AM, Mike Frysinger wrote:
> > On Monday 28 November 2011 17:31:19 Graeme Russ wrote:
> >> $ git fetch u-boot
> >> ...
> >> $ git rebase u-boot/master
> >> ...
> >> $ git push ssh://gu-x86 at git.denx.de/u-boot-x86
> >> ...
> >> To ssh://gu-x86 at git.denx.de/u-boot-x86
> >> ! [rejected] master -> master (non-fast-forward)
> >
> > well, you did a rebase, so this is kind of par for the course. use
> > --force to rewrite the published branch.
>
> So how do you keep the sub-repo up-to-date with u-boot/master without
> doing forced pushes?
you don't :). the way *i* work is to keep my changes in my own branch that i
rewrite, and then once i want to send that to Wolfgang, i publish the updated
master branch for him to pull from.
i think the u-boot wiki has a "suggested maintainer workflow", but i haven't
looked too hard at that as i like (logically) how i do things now.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20111128/247ea350/attachment.pgp>
next prev parent reply other threads:[~2011-11-28 23:13 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-28 22:31 [U-Boot] Attn Maintainers: git advise needed (how to fix messed up repo) Graeme Russ
2011-11-28 23:02 ` Mike Frysinger
2011-11-28 23:05 ` Graeme Russ
2011-11-28 23:13 ` Mike Frysinger [this message]
2011-11-28 23:16 ` Andy Fleming
2011-11-28 23:20 ` Graeme Russ
2011-11-28 23:43 ` Mike Frysinger
2011-11-29 0:02 ` Graeme Russ
2011-11-29 3:31 ` Mike Frysinger
2011-11-29 3:35 ` Graeme Russ
2011-11-29 4:01 ` Mike Frysinger
2011-11-29 4:17 ` Graeme Russ
2011-11-29 4:49 ` Mike Frysinger
2011-11-29 5:04 ` Graeme Russ
2011-11-29 5:31 ` Andy Fleming
2011-11-29 5:36 ` Mike Frysinger
2011-11-29 10:51 ` Graeme Russ
2011-11-29 15:08 ` Mike Frysinger
2011-11-29 22:57 ` Graeme Russ
2011-11-29 23:35 ` Mike Frysinger
2011-11-29 23:48 ` Graeme Russ
2011-11-30 3:52 ` Mike Frysinger
2011-11-30 4:12 ` Graeme Russ
2011-11-30 16:41 ` Mike Frysinger
2011-11-29 9:55 ` Graeme Russ
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=201111281813.04391.vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=u-boot@lists.denx.de \
/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