All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Wilcox <matthew@wil.cx>
To: parisc-linux@parisc-linux.org
Subject: [parisc-linux] Git tree rebased
Date: Tue, 31 Oct 2006 08:00:01 -0700	[thread overview]
Message-ID: <20061031150001.GB26964@parisc-linux.org> (raw)


So, as discussed previously [1], I've just rebased the git tree on top of
Linus' 2.6.19-rc4.  You can see our old history on the devel-2006-10-31
branch [2], but our shiny new history is on master, and conveniently at
the top for easy reading of what we haven't merged yet.

If your remotes file currently has a line in it like:

	Pull: refs/heads/master:refs/heads/origin

then you'll want to add the '+' at the beginning:

	Pull: +refs/heads/master:refs/heads/origin

otherwise git will refuse to update.  With the +, it will complain, but
do it anyway.


[1] http://lists.parisc-linux.org/pipermail/parisc-linux/2006-October/030326.html
[2] http://git.parisc-linux.org/?p=linux-2.6.git;a=shortlog;h=devel-2006-10-31
_______________________________________________
parisc-linux mailing list
parisc-linux@lists.parisc-linux.org
http://lists.parisc-linux.org/mailman/listinfo/parisc-linux

             reply	other threads:[~2006-10-31 15:00 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-10-31 15:00 Matthew Wilcox [this message]
2006-10-31 16:05 ` [parisc-linux] Git tree rebased Matthew Wilcox
     [not found] ` <45487F41.4020509@scarlet.be>
     [not found]   ` <20061101124125.GB11399@parisc-linux.org>
2006-11-01 14:42     ` Joel Soete

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=20061031150001.GB26964@parisc-linux.org \
    --to=matthew@wil.cx \
    --cc=parisc-linux@parisc-linux.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.