From: "Paolo Ciarrocchi" <paolo.ciarrocchi@gmail.com>
To: "Petr Baudis" <pasky@suse.cz>
Cc: "Git Mailing List" <git@vger.kernel.org>
Subject: Re: Help please :-)
Date: Sun, 16 Apr 2006 11:30:07 +0200 [thread overview]
Message-ID: <4d8e3fd30604160230g45a67efh9027a7e292e42f3c@mail.gmail.com> (raw)
In-Reply-To: <20060415191039.GC27689@pasky.or.cz>
On 4/15/06, Petr Baudis <pasky@suse.cz> wrote:
> Hello,
>
> Dear diary, on Sat, Apr 15, 2006 at 06:08:01PM CEST, I got a letter
> where Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> said that...
> > I'm used to keep updated my linux tree with cg-status,
> > I did that this morning but now I see the following:
> > paolo@Italia:~/linux-2.6$ cg-status
> > Heads:
> > >master 2c5362007bc0a46461a9d94958cdd53bb027004c
> > R origin 2c5362007bc0a46461a9d94958cdd53bb027004c
> >
> > ? arch/i386/kernel/smpboot.c.rej
> > ? drivers/md/dm-stripe.c.rej
> > ? drivers/net/chelsio/sge.c.rej
> > ? drivers/net/e100.c.rej
> > ? drivers/net/e1000/e1000_main.c.rej
> > ? fs/9p/vfs_dir.c.rej
> > ? fs/nfsctl.c.rej
> > ? kernel/fork.c.rej
> > ? kernel/posix-timers.c.rej
> > ? kernel/timer.c.rej
> > ? mm/memory.c.rej
> > ? mm/mempolicy.c.rej
> > ? mm/swap.c.rej
> > ? net/ieee80211/ieee80211_crypt_ccmp.c.rej
> > ? net/ieee80211/ieee80211_rx.c.rej
> > ? scripts/kconfig/lkc_defs.h
> > ? scripts/mod/modpost.c.rej
> > paolo@Italia:~/linux-2.6$ cg-diff
> >
> > I'm a bit lost, the tree is correctly updated, no error message but
> > why I see all these .rej?
>
> you apparently had local changes in your working tree, did cg-update
> and then the local changes conflicted with the new changes in Linus'
> tree. cg-update should have told you further details.
Can this be due an interrupted cg-update?
However, cg-update did not complain.
> > And how can I fix this problem?
> > git reset and cg-reset don't help...
>
> cg-clean can remove files not recognized by git.
Thanks!
Ciao,
--
Paolo
http://paolociarrocchi.googlepages.com
prev parent reply other threads:[~2006-04-16 9:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-15 16:08 Help please :-) Paolo Ciarrocchi
2006-04-15 19:10 ` Petr Baudis
2006-04-16 9:30 ` Paolo Ciarrocchi [this message]
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=4d8e3fd30604160230g45a67efh9027a7e292e42f3c@mail.gmail.com \
--to=paolo.ciarrocchi@gmail.com \
--cc=git@vger.kernel.org \
--cc=pasky@suse.cz \
/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).