From: "Shawn O. Pearce" <spearce@spearce.org>
To: Leandro Lucarella <llucarella@integratech.com.ar>
Cc: git@vger.kernel.org
Subject: Re: git citool/gui bug
Date: Wed, 30 Jul 2008 20:23:37 -0700 [thread overview]
Message-ID: <20080731032337.GA1860@spearce.org> (raw)
In-Reply-To: <20080730185306.GV7616@integratech.com.ar>
Leandro Lucarella <llucarella@integratech.com.ar> wrote:
> Hi! I think I've hit a really silly bug in citool/gui:
>
> git citool shows:
>
> new file mode 100644 # black
> @@ -0,0 +1,5 @@ # blue
> + # green
> =============== # orange
> +Hello World!!!! # green
> =============== # orange
> + # green
Hmph. Don't put 7 = on a line together. Or 7 < or 7 > for that
matter. It confuses some git related tools like git-rerere,
the template pre-commit hook, and git-gui.
In this case we think these are the lines between two hunks in a
merge conflict, so we are showing them specially to you. Just in
case you staged a conflicted hunk by accident during a merge you
want it to stand out to help you notice the error.
Yes, it would be nice if git-gui knew this wasn't actually a merge
conflict but was instead proper text. Sadly it isn't that smart.
--
Shawn.
prev parent reply other threads:[~2008-07-31 3:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-30 18:53 git citool/gui bug Leandro Lucarella
2008-07-31 3:23 ` Shawn O. Pearce [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=20080731032337.GA1860@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=llucarella@integratech.com.ar \
/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).