From: Yves Goergen <nospam.list@unclassified•de>
To: Jeff King <peff@peff•net>
Cc: git@vger•kernel.org
Subject: Re: Bug! Git merge also fails with a wrong error message
Date: Fri, 13 Jan 2012 20:05:56 +0100 [thread overview]
Message-ID: <4F108094.5080705@unclassified.de> (raw)
In-Reply-To: <20120113185436.GA13522@sigill.intra.peff.net>
On 13.01.2012 19:54 CE(S)T, Jeff King wrote:
> Whether you realize it or not, git is using the index to store state.
> When you "git add", "git rm", or "git mv", it is updating the index.
I'm using TortoiseGit most of the time and that doesn't expose the
concept of an "index". I edit files as usual, then select "commit" and
get the commit dialogue. In there I enter the commit message and select
all files to commit. I can add new files right there. There is no
two-step procedure.
> I notice that in your first mail, you mentioned a problem with
> "checkout", and in the second one, a problem with "merge". Do you still
> have the repo around with the "checkout" problem? If so, is the file
> also in your "git ls-files" output in that repo?
Yes, I have made a backup of the repo right after the initial problem
arose. And the git ls-files output is the same regarding that file.
> Which version of git are you using? There were many bugs fixed around
> this area of merge around the v1.7.7 timeframe.
msysGit 1.7.8 on Windows XP SP3. It's a "preview" but since Git is so
old now and there's been nothing but "previews", I consider msysGit's
meaning of the word "preview" as "stable".
--
Yves Goergen "LonelyPixel" <nospam.list@unclassified•de>
Visit my web laboratory at http://beta.unclassified.de
next prev parent reply other threads:[~2012-01-13 19:06 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-12 18:44 Bug? Git checkout fails with a wrong error message Yves Goergen
2012-01-13 12:50 ` Holger Hellmuth
2012-01-13 17:46 ` Yves Goergen
2012-01-13 19:28 ` Holger Hellmuth
2012-01-15 8:14 ` Yves Goergen
2012-01-16 11:07 ` Holger Hellmuth
2012-01-16 18:50 ` Yves Goergen
2012-01-16 19:09 ` Jeff King
2012-01-16 21:20 ` Yves Goergen
2012-01-16 21:27 ` Jeff King
2012-01-17 7:41 ` Yves Goergen
2012-01-16 19:17 ` Thomas Rast
[not found] ` <4F152767.9010104@unclassified.de>
2012-01-17 8:45 ` Thomas Rast
2012-01-17 17:56 ` Yves Goergen
2012-01-19 10:24 ` Thomas Rast
2012-01-16 21:18 ` Erik Faye-Lund
2012-01-16 18:58 ` Yves Goergen
2012-01-13 17:37 ` Bug! Git merge also " Yves Goergen
2012-01-13 17:50 ` Jeff King
2012-01-13 18:49 ` Yves Goergen
2012-01-13 18:54 ` Jeff King
2012-01-13 19:05 ` Yves Goergen [this message]
2012-01-13 17:56 ` Carlos Martín Nieto
2012-01-13 18:59 ` Yves Goergen
2012-01-13 19:34 ` Jakub Narebski
2012-01-15 8:17 ` Yves Goergen
2012-01-15 10:08 ` Jakub Narebski
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=4F108094.5080705@unclassified.de \
--to=nospam.list@unclassified$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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