From: Joe Eloff <kagen101@gmail.com>
To: kernel-janitors@vger.kernel.org
Subject: Keeping up to date with the upstream
Date: Mon, 05 Jul 2010 20:43:10 +0000 [thread overview]
Message-ID: <1278362590.5396.35.camel@dermezel> (raw)
Hi
Just need clarification on this procedure:
What to do when git fetch origin tells you origin/master has diverged from your local master and
you are working on a branch making patches?
A link or search words will be fine will do reading myself.
Regards,
Joe
next reply other threads:[~2010-07-05 20:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-05 20:43 Joe Eloff [this message]
2010-07-05 20:52 ` Keeping up to date with the upstream Peter Hüwe
2010-07-05 21:11 ` Joe Eloff
2010-07-05 21:37 ` Peter Hüwe
2010-07-05 21:44 ` Joe Eloff
2010-07-06 8:28 ` Nicolas Palix
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=1278362590.5396.35.camel@dermezel \
--to=kagen101@gmail.com \
--cc=kernel-janitors@vger.kernel.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.
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.