From: Johannes Sixt <j.sixt@viscovery.net>
To: Marcelo de Moraes Serpa <celoserpa@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Pulled files with "new file" status
Date: Mon, 20 Jul 2009 09:40:03 +0200 [thread overview]
Message-ID: <4A641F53.9010901@viscovery.net> (raw)
In-Reply-To: <1e5bcefd0907192245j19aac1aar804a0e3bd637b46b@mail.gmail.com>
Marcelo de Moraes Serpa schrieb:
> I git pulled again and get the updates
> from a friend, but the intriguing thing is that, the files that he
> added appeared as "new file" for me too. Why's that? I haven't been
> the one who added the file, he added it, why git would pull objects
> and tell me they are new ?
Perhaps because they *are* new for you?
------Y--M <-- you
/
------F <-- your friend
If F added files, then you pull F, which creates the merge commit M, then
the files are also new for *you*.
I assume you were looking at the diff summary that 'git pull' reported.
This diff is the difference from Y to M, and in that diff, the files *are*
new because they are now in M, but not in Y.
-- Hannes
prev parent reply other threads:[~2009-07-20 7:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-20 5:45 Pulled files with "new file" status Marcelo de Moraes Serpa
2009-07-20 7:40 ` Johannes Sixt [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=4A641F53.9010901@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=celoserpa@gmail.com \
--cc=git@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.