From: Petr Baudis <pasky@suse.cz>
To: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Help please :-)
Date: Sat, 15 Apr 2006 21:10:39 +0200 [thread overview]
Message-ID: <20060415191039.GC27689@pasky.or.cz> (raw)
In-Reply-To: <4d8e3fd30604150908m565e8aaat8ef9846a85c4036e@mail.gmail.com>
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.
> And how can I fix this problem?
> git reset and cg-reset don't help...
cg-clean can remove files not recognized by git.
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Right now I am having amnesia and deja-vu at the same time. I think
I have forgotten this before.
next prev parent reply other threads:[~2006-04-15 19:10 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 [this message]
2006-04-16 9:30 ` Paolo Ciarrocchi
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=20060415191039.GC27689@pasky.or.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=paolo.ciarrocchi@gmail.com \
/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).