From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Christoph Duelli <duelli@melosgmbh.de>
Cc: git@vger.kernel.org
Subject: Re: git mv + git pull issue
Date: Fri, 6 Jun 2008 16:40:28 +0100 (BST) [thread overview]
Message-ID: <alpine.DEB.1.00.0806061639390.1783@racer> (raw)
In-Reply-To: <4848EDDF.7090906@melosgmbh.de>
Hi,
On Fri, 6 Jun 2008, Christoph Duelli wrote:
> cd ../gitmv
> git mv afile newname
> # do not commit
> # now: afile is not in the directory anymore
> # oh, I need those changes my colleague made...
> git pull ../gitmv-clone/
> # now: both(!) afile and newname are in the directory
What is so surprising there? We _always_ recommend to commit before
pulling.
Ciao,
Dscho
next prev parent reply other threads:[~2008-06-06 15:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-06 7:57 git mv + git pull issue Christoph Duelli
2008-06-06 15:40 ` Johannes Schindelin [this message]
2008-06-09 8:45 ` Christoph Duelli
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=alpine.DEB.1.00.0806061639390.1783@racer \
--to=johannes.schindelin@gmx.de \
--cc=duelli@melosgmbh.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox